From ec94cda27bf6d71173b84af9d49a36f514e36c61 Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sat, 11 Jan 2025 20:21:28 +0200 Subject: [PATCH] Revert "_TEST X11" This reverts commit 19852273b75d40f16b94a3cd90f4613056570978. --- Source/Editor/Editor.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp index e78134566..8e4090c40 100644 --- a/Source/Editor/Editor.cpp +++ b/Source/Editor/Editor.cpp @@ -84,9 +84,6 @@ bool Editor::CheckProjectUpgrade() LOG(Warning, "Missing version cache file"); } - if (SDLPlatform::UsesX11()) - const auto result = MessageBox::Show(TEXT("The project was opened with the older editor version last time. Loading it may modify existing data so older editor version won't open it. Do you want to perform a backup before or cancel operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Question); - // Check if project is in the old, deprecated layout if (EditorImpl::IsOldProjectXmlFormat) { @@ -271,7 +268,7 @@ bool Editor::CheckProjectUpgrade() // Check if last version was older else if (lastMajor < FLAXENGINE_VERSION_MAJOR || (lastMajor == FLAXENGINE_VERSION_MAJOR && lastMinor < FLAXENGINE_VERSION_MINOR)) { - /*LOG(Warning, "The project was opened with the older editor version last time"); + LOG(Warning, "The project was opened with the older editor version last time"); const auto result = MessageBox::Show(TEXT("The project was opened with the older editor version last time. Loading it may modify existing data so older editor version won't open it. Do you want to perform a backup before or cancel operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Question); if (result == DialogResult::Yes) { @@ -289,7 +286,7 @@ bool Editor::CheckProjectUpgrade() { // Cancel return true; - }*/ + } } // Check if last version was newer else if (lastMajor > FLAXENGINE_VERSION_MAJOR || (lastMajor == FLAXENGINE_VERSION_MAJOR && lastMinor > FLAXENGINE_VERSION_MINOR))