mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-17 05:34:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Switching between SP and DP before previews had finished would set the current flame back to the first one in the file.
This commit is contained in:
mfeemster
2016-06-07 20:37:15 -07:00
parent 51dbe8e59d
commit 51c1cc7a83
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Fractorium/FractoriumMenus.cpp
View File

@ -370,8 +370,9 @@ void Fractorium::OnActionSaveCurrentScreen(bool checked)
/// preview renderer.
/// This does not save to disk.
/// </summary>
/// <param name="render">Whether to re-render the preview thumbnail after saving to the open file. Default: true.</param>
template <typename T>
uint FractoriumEmberController<T>::SaveCurrentToOpenedFile()
uint FractoriumEmberController<T>::SaveCurrentToOpenedFile(bool render)
{
uint i = 0;
bool fileFound = false;
@ -395,12 +396,12 @@ uint FractoriumEmberController<T>::SaveCurrentToOpenedFile()
StopPreviewRender();
m_EmberFile.m_Embers.push_back(m_Ember);
m_EmberFile.MakeNamesUnique();
UpdateLibraryTree();
if (render)
UpdateLibraryTree();
}
else
{
else if (render)
RenderPreviews(i, i + 1);
}
}
return i;
@ -832,7 +833,7 @@ void Fractorium::OnActionFinalRender(bool checked)
//First completely stop what the current rendering process is doing.
m_Controller->DeleteRenderer();//Delete the renderer, but not the controller.
m_Controller->StopPreviewRender();
m_Controller->SaveCurrentToOpenedFile();//Save whatever was edited back to the current open file.
m_Controller->SaveCurrentToOpenedFile(false);//Save whatever was edited back to the current open file.
m_RenderStatusLabel->setText("Renderer stopped.");
m_FinalRenderDialog->show();
}