GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "_TEST X11"

Browse Source 
This reverts commit 19852273b7.
This commit is contained in:
Ari Vuollet
2025-01-11 20:21:28 +02:00
parent 19852273b7
commit ec94cda27b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Editor/Editor.cpp
View File

@@ -84,9 +84,6 @@ bool Editor::CheckProjectUpgrade()
LOG(Warning, "Missing version cache file"); 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 // Check if project is in the old, deprecated layout
if (EditorImpl::IsOldProjectXmlFormat) if (EditorImpl::IsOldProjectXmlFormat)
{ {
@@ -271,7 +268,7 @@ bool Editor::CheckProjectUpgrade()
// Check if last version was older // Check if last version was older
else if (lastMajor < FLAXENGINE_VERSION_MAJOR || (lastMajor == FLAXENGINE_VERSION_MAJOR && lastMinor < FLAXENGINE_VERSION_MINOR)) 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); 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) if (result == DialogResult::Yes)
{ {
@@ -289,7 +286,7 @@ bool Editor::CheckProjectUpgrade()
{ {
// Cancel // Cancel
return true; return true;
}*/ }
} }
// Check if last version was newer // Check if last version was newer
else if (lastMajor > FLAXENGINE_VERSION_MAJOR || (lastMajor == FLAXENGINE_VERSION_MAJOR && lastMinor > FLAXENGINE_VERSION_MINOR)) else if (lastMajor > FLAXENGINE_VERSION_MAJOR || (lastMajor == FLAXENGINE_VERSION_MAJOR && lastMinor > FLAXENGINE_VERSION_MINOR))