From 401d7d747e44731a1b5ed4988f07270051a784b5 Mon Sep 17 00:00:00 2001 From: William JCM Date: Mon, 17 Aug 2020 13:10:45 +0200 Subject: [PATCH] Fix a regression introduced in 1.1.2. Again. --- GUI/EvtMainFrame.cpp | 2 +- GUI/EvtMainFrame.h | 2 +- GUI/MainFrame.fbp | 2 +- GUI/MainFrame.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GUI/EvtMainFrame.cpp b/GUI/EvtMainFrame.cpp index 01a0058..fae51dc 100644 --- a/GUI/EvtMainFrame.cpp +++ b/GUI/EvtMainFrame.cpp @@ -231,7 +231,7 @@ void EvtMainFrame::renameMassEvent(wxCommandEvent&) { } } -void EvtMainFrame::backupEvent(wxCommandEvent&) { +void EvtMainFrame::backupSavesEvent(wxCommandEvent&) { const static std::string error_prefix = "Backup failed:\n\n"; wxString current_timestamp = wxDateTime::Now().Format("%Y-%m-%d_%H-%M-%S"); diff --git a/GUI/EvtMainFrame.h b/GUI/EvtMainFrame.h index 52e8458..edb7d7e 100644 --- a/GUI/EvtMainFrame.h +++ b/GUI/EvtMainFrame.h @@ -40,7 +40,7 @@ class EvtMainFrame: public MainFrame { void moveMassEvent(wxCommandEvent&); void deleteMassEvent(wxCommandEvent&); void renameMassEvent(wxCommandEvent&); - void backupEvent(wxCommandEvent&); + void backupSavesEvent(wxCommandEvent&); void openSaveDirEvent(wxCommandEvent&); void stagingSelectionEvent(wxCommandEvent&); void deleteStagedEvent(wxCommandEvent&); diff --git a/GUI/MainFrame.fbp b/GUI/MainFrame.fbp index 73fbe3b..7bbafd3 100644 --- a/GUI/MainFrame.fbp +++ b/GUI/MainFrame.fbp @@ -48,7 +48,7 @@ -1,-1 wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU ; ; forward_declare - M.A.S.S. Manager 1.2.1 + M.A.S.S. Manager 1.2.2 diff --git a/GUI/MainFrame.h b/GUI/MainFrame.h index e325e6c..6a6ec95 100644 --- a/GUI/MainFrame.h +++ b/GUI/MainFrame.h @@ -96,7 +96,7 @@ class MainFrame : public wxFrame public: - MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("M.A.S.S. Manager 1.2.1"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxCLIP_CHILDREN|wxTAB_TRAVERSAL ); + MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("M.A.S.S. Manager 1.2.2"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxCLIP_CHILDREN|wxTAB_TRAVERSAL ); ~MainFrame();