From d3f1027df2293ff2e00f44070224f117663e89f6 Mon Sep 17 00:00:00 2001
From: William JCM <w.jcm59@gmail.com>
Date: Wed, 22 Jul 2020 16:03:11 +0200
Subject: [PATCH] Fix a regression introduced in 1.1.2.

---
 GUI/EvtMainFrame.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/GUI/EvtMainFrame.cpp b/GUI/EvtMainFrame.cpp
index 1bee70e..081837f 100644
--- a/GUI/EvtMainFrame.cpp
+++ b/GUI/EvtMainFrame.cpp
@@ -32,6 +32,11 @@ using namespace Corrade;
 EvtMainFrame::EvtMainFrame(wxWindow* parent): MainFrame(parent) {
     SetIcon(wxIcon("MAINICON"));
 
+    warningMessage(wxString::FromUTF8("Before you start using this app, a few things you should know:\n\n"
+                                      "For this application to work properly, Steam Cloud syncing needs to be disabled for the game.\nTo disable it, right-click the game in your Steam library, click \"Properties\", go to the \"Updates\" tab, and uncheck \"Enable Steam Cloud synchronization for M.A.S.S. Builder\".\n\n"
+                                      "DISCLAIMER: The developer of this application cannot be held responsible for data loss or corruption. PLEASE USE AT YOUR OWN RISK!\n\n"
+                                      "Last but not least, this application is released under the terms of the GNU General Public Licence version 3. Please see the COPYING file for more details."));
+
     if(!_manager.ready()) {
         errorMessage("There was an issue initialising the manager:\n\n" + _manager.lastError());
         return;
@@ -46,11 +51,6 @@ EvtMainFrame::EvtMainFrame(wxWindow* parent): MainFrame(parent) {
     _installedListView->Connect(wxEVT_LIST_BEGIN_DRAG, wxListEventHandler(EvtMainFrame::listColumnDragEvent), nullptr, this);
     _installedListView->Connect(wxEVT_LIST_COL_BEGIN_DRAG, wxListEventHandler(EvtMainFrame::listColumnDragEvent), nullptr, this);
 
-    warningMessage(wxString::FromUTF8("Before you start using this app, a few things you should know:\n\n"
-                                      "For this application to work properly, Steam Cloud syncing needs to be disabled for the game.\nTo disable it, right-click the game in your Steam library, click \"Properties\", go to the \"Updates\" tab, and uncheck \"Enable Steam Cloud synchronization for M.A.S.S. Builder\".\n\n"
-                                      "DISCLAIMER: The developer of this application cannot be held responsible for data loss or corruption. PLEASE USE AT YOUR OWN RISK!\n\n"
-                                      "Last but not least, this application is released under the terms of the GNU General Public Licence version 3. Please see the COPYING file for more details."));
-
     _watcher.Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler(EvtMainFrame::fileUpdateEvent), nullptr, this);
     _watcher.AddTree(wxFileName(Utility::Directory::toNativeSeparators(_manager.saveDirectory()), wxPATH_WIN),
                      wxFSW_EVENT_CREATE|wxFSW_EVENT_DELETE|wxFSW_EVENT_MODIFY|wxFSW_EVENT_RENAME, wxString::Format("*%s.sav", _manager.steamId()));
@@ -82,6 +82,8 @@ EvtMainFrame::EvtMainFrame(wxWindow* parent): MainFrame(parent) {
         return;
     }
 
+    _manager.loadScreenshots();
+
     _watcher.AddTree(wxFileName(Utility::Directory::toNativeSeparators(_manager.screenshotDirectory()), wxPATH_WIN),
                      wxFSW_EVENT_CREATE|wxFSW_EVENT_DELETE, "*.png"); // Not monitoring wxFSW_EVENT_{MODIFY,RENAME}, because they're a massive pain to handle. Ugh.