diff options
| author | DioEgizio <83089242+DioEgizio@users.noreply.github.com> | 2022-05-22 20:03:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-22 20:03:10 +0200 |
| commit | 2be583ad4de0a8b85c1d7592c944c75481e9fad9 (patch) | |
| tree | eb11c81d365cf20a3219c4e13eacab38dc775f20 | |
| parent | c988b4d213b4125d298c893637a2362a7f192fce (diff) | |
| parent | efcba698ac3846019db1947f986c64aa477170af (diff) | |
| download | PrismLauncher-2be583ad4de0a8b85c1d7592c944c75481e9fad9.tar.gz PrismLauncher-2be583ad4de0a8b85c1d7592c944c75481e9fad9.tar.bz2 PrismLauncher-2be583ad4de0a8b85c1d7592c944c75481e9fad9.zip | |
Merge branch 'PolyMC:develop' into patch-6
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e07d2aa6..e6d66b8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,10 @@ set(CMAKE_CXX_FLAGS " -Wall -pedantic -Werror -Wno-deprecated-declarations -D_GL if(UNIX AND APPLE) set(CMAKE_CXX_FLAGS " -stdlib=libc++ ${CMAKE_CXX_FLAGS}") endif() +# FIXME: GCC 12 complains about some random stuff in QuaZip. Need to fix this later +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(CMAKE_CXX_FLAGS "-Wno-error=stringop-overflow ${CMAKE_CXX_FLAGS}") +endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type") # Fix build with Qt 5.13 diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index f016dc76..7e152b96 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -1868,6 +1868,9 @@ void MainWindow::globalSettingsClosed() updateMainToolBar(); updateToolsMenu(); updateStatusCenter(); + // This needs to be done to prevent UI elements disappearing in the event the config is changed + // but PolyMC exits abnormally, causing the window state to never be saved: + APPLICATION->settings()->set("MainWindowState", saveState().toBase64()); update(); } |