mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-03-13 15:21:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Fix final render dialog failure when minimizing and restoring during a render on Linux. Note this bug was not present on Windows.
This commit is contained in:
mfeemster 2016-05-16 19:24:45 -07:00
parent 5aec58b4a2
commit 33cc2a4326
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -636,7 +636,10 @@ void FractoriumFinalRenderDialog::OnCancelRenderClicked(bool checked)
/// <param name="e">The event</param> /// <param name="e">The event</param>
void FractoriumFinalRenderDialog::showEvent(QShowEvent* e) void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
{ {
if (CreateControllerFromGUI(true)) if (m_Controller.get() && m_Controller->m_Run)
return;
if (CreateControllerFromGUI(true))//Create controller if it does not exist, or if it does and the renderer is not running.
{ {
int index = int(m_Fractorium->m_Controller->Index()) + 1; int index = int(m_Fractorium->m_Controller->Index()) + 1;
#ifdef DO_DOUBLE #ifdef DO_DOUBLE

2
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -38,7 +38,7 @@ void FinalRenderEmberController<T>::CancelRender()
m_Renderer->Abort(); m_Renderer->Abort();
while (m_Renderer->InRender()) while (m_Renderer->InRender())
QApplication::processEvents(); std::this_thread::sleep_for(std::chrono::milliseconds(10));
m_Renderer->EnterRender(); m_Renderer->EnterRender();
m_Renderer->EnterFinalAccum(); m_Renderer->EnterFinalAccum();