* In save/exit confirmation, do not display the Cancel button if exiting the program or no longer in the asset editor.

Author: luciusDXL

TheForceEngine/TFE_Editor/LevelEditor/confirmDialogs.cpp

@@ -62,10 +62,13 @@ namespace LevelEditor
 				editor_closeLevel(/*save*/false);
 				exit = true;
 			}
-			ImGui::SameLine();
-			if (ImGui::Button("Cancel"))
+			if (TFE_Editor::isInAssetEditor() && !TFE_Editor::isProgramExiting())
 			{
-				exit = true;
+				ImGui::SameLine();
+				if (ImGui::Button("Cancel"))
+				{
+					exit = true;
+				}
 			}
 			ImGui::EndPopup();
 		}

TheForceEngine/TFE_Editor/editor.cpp

@@ -70,6 +70,7 @@ namespace TFE_Editor
 	static u32 s_editorPopupUserData = 0;
 	static void* s_editorPopupUserPtr = nullptr;
 	static bool s_exitEditor = false;
+	static bool s_programExiting = false;
 	static bool s_configView = false;
 	static WorkBuffer s_workBuffer;
 	static char s_projectPath[TFE_MAX_PATH] = "";
@@ -115,6 +116,7 @@ namespace TFE_Editor
 		// Ui begin/render is called so we have a "UI Frame" in which to setup UI state.
 		s_editorMode = EDIT_ASSET_BROWSER;
 		s_exitEditor = false;
+		s_programExiting = false;
 		loadFonts();
 		loadIcons();
 		loadConfig();
@@ -567,13 +569,14 @@ namespace TFE_Editor
 		}
 	}
 
-	bool update(bool consoleOpen, bool minimized)
+	bool update(bool consoleOpen, bool minimized, bool exiting)
 	{
 		// If the program is minimized, the editor should skip any processing.
 		if (minimized)
 		{
 			return s_exitEditor;
 		}
+		s_programExiting = exiting;
 
 		editor_clearUid();
 		thumbnail_update();
@@ -663,6 +666,16 @@ namespace TFE_Editor
 		ImGui::PopStyleVar();
 	}
 
+	bool isInAssetEditor()
+	{
+		return s_editorMode == EDIT_ASSET;
+	}
+
+	bool isProgramExiting()
+	{
+		return s_programExiting;
+	}
+
 	void drawTitle()
 	{
 		DisplayInfo info;

TheForceEngine/TFE_Editor/editor.h

@@ -118,7 +118,7 @@ namespace TFE_Editor
 
 	void enable();
 	bool disable();
-	bool update(bool consoleOpen = false, bool minimized = false);
+	bool update(bool consoleOpen = false, bool minimized = false, bool exiting = false);
 	bool render();
 	TextureGpu* getIconAtlas();
 
@@ -179,4 +179,7 @@ namespace TFE_Editor
 
 	Vec2i getEditorVersion();
 	bool mouseInsideItem();
+
+	bool isInAssetEditor();
+	bool isProgramExiting();
 }

TheForceEngine/main.cpp

@@ -966,7 +966,7 @@ int main(int argc, char* argv[])
 			TFE_Ui::begin();
 			TFE_System::update();
 
-			TFE_Editor::update();
+			TFE_Editor::update(false, false, /*exiting*/true);
 			bool swap = TFE_Editor::render();
 
 			// Blit the frame to the window and draw UI.