eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-17 13:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix Quit action in menu

Browse Source
This commit is contained in:
Bruno Herbelin
2022-07-23 12:07:07 +02:00
parent b46788c81a
commit 7a2f3fe840
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
UserInterfaceManager.cpp
View File

@@ -716,15 +716,16 @@ bool UserInterface::TryClose()
if (pending_save_on_exit) if (pending_save_on_exit)
return true; return true;
// save on exit // check if there is something to save
pending_save_on_exit = false; pending_save_on_exit = false;
if (Settings::application.recentSessions.save_on_exit && !Mixer::manager().session()->empty()) if (!Mixer::manager().session()->empty())
{ {
// determine if a pending save of session is required // determine if a pending save of session is required
if (Mixer::manager().session()->filename().empty()) if (Mixer::manager().session()->filename().empty())
// need to wait for user to give a filename // need to wait for user to give a filename
pending_save_on_exit = true; pending_save_on_exit = true;
else // save on exit
else if (Settings::application.recentSessions.save_on_exit)
// ok to save the session // ok to save the session
Mixer::manager().save(false); Mixer::manager().save(false);
} }
@@ -1001,8 +1002,8 @@ void UserInterface::showMenuFile()
ImGui::Separator(); ImGui::Separator();
if (ImGui::MenuItem( IMGUI_TITLE_HELP, SHORTCUT_HELP)) if (ImGui::MenuItem( IMGUI_TITLE_HELP, SHORTCUT_HELP))
Settings::application.widget.help = true; Settings::application.widget.help = true;
if (ImGui::MenuItem( MENU_QUIT, SHORTCUT_QUIT)) if (ImGui::MenuItem( MENU_QUIT, SHORTCUT_QUIT) && TryClose())
TryClose(); Rendering::manager().close();
} }