Merge pull request #1178 from isanae/2_3_0

Merge 2.3.1 changes

.github/ISSUE_TEMPLATE/game-support-request.md

@@ -1,27 +0,0 @@
----
-name: Game support Request
-about: Request support for a new game
-title: Add support for game [GAME NAME]
-labels: 'additional games support, Feature Request, area: mo2 game plugins'
-assignees: ''
-
----
-
-**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.** 
-
-**If you are vaguely familiar with programming you can try following the instructions on that link to get something working yourself. If you have trouble with that please fill in this template.**
-
-**Please provide the following information for the game (remove the optional lines you do not use):**
-
-- **Name:** Name of the game
-- **Short name:** Name of the game in Nexus URL (e.g. skyrimse for Skyrim SE).
-- **Nexus ID [optional]:** ID of the game on Nexus (you can usually find this in Nexus URL).
-- **Executable:** Name of the main executable for the game (relative to the game folder).
-- **Launcher [optional]:** Name of the game launcher (relative to the game folder).
-- **Data path:** Path to the data folder of the game (relative to the game folder).
-- **Documents path:** Path to folder containing INI files, etc., for the game (usually under "My Games", or the game folder itself).
-- **Saves directory [optional]:** Path to the folder containing save games (this default to the path above).
-- **Save extension [optional]:** Extension of the saves
-- **Steam ID [optional]:** ID of the game on Steam (if the game is on Steam).
-
-**Provide additional details regarding the game that could be required for the plugin.**

src/main.cpp

@@ -128,7 +128,6 @@ bool bootstrap()
 }
 
 thread_local LPTOP_LEVEL_EXCEPTION_FILTER prevUnhandledExceptionFilter = nullptr;
-thread_local std::terminate_handler prevTerminateHandler = nullptr;
 
 LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs)
 {
@@ -159,18 +158,12 @@ void terminateHandler() noexcept
       )
   {
   }
-
-  if (prevTerminateHandler) {
-    prevTerminateHandler();
-  } else {
-    std::abort();
-  }
 }
 
 void setUnhandledExceptionHandler()
 {
   prevUnhandledExceptionFilter = SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
-  prevTerminateHandler = std::set_terminate(terminateHandler);
+  std::set_terminate(terminateHandler);
 }
 
 // Parses the first parseArgCount arguments of the current process command line and returns

src/organizerproxy.h

@@ -65,7 +65,7 @@ private:
   OrganizerCore *m_Proxied;
   PluginContainer *m_PluginContainer;
 
-  QString m_PluginName;
+  const QString &m_PluginName;
 
 };