Merge pull request #1198 from isanae/2_3_0

Remove RC
removed rc
2026-07-27 13:58:24 -07:00 · 2020-08-17 01:48:22 -04:00 · 2020-08-17 01:42:11 -04:00 · 2020-08-13 14:48:35 -04:00 · 2020-08-13 14:47:35 -04:00 · 2020-08-13 14:46:47 -04:00
3 changed files with 11 additions and 4 deletions
@@ -128,6 +128,7 @@ bool bootstrap()
 }

 thread_local LPTOP_LEVEL_EXCEPTION_FILTER prevUnhandledExceptionFilter = nullptr;
+thread_local std::terminate_handler prevTerminateHandler = nullptr;

 LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs)
 {
@@ -158,12 +159,18 @@ void terminateHandler() noexcept
      )
  {
  }
+
+  if (prevTerminateHandler) {
+    prevTerminateHandler();
+  } else {
+    std::abort();
+  }
 }

 void setUnhandledExceptionHandler()
 {
  prevUnhandledExceptionFilter = SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
-  std::set_terminate(terminateHandler);
+  prevTerminateHandler = std::set_terminate(terminateHandler);
 }

 // Parses the first parseArgCount arguments of the current process command line and returns
@@ -65,7 +65,7 @@ private:
  OrganizerCore *m_Proxied;
  PluginContainer *m_PluginContainer;

-  const QString &m_PluginName;
+  QString m_PluginName;

 };

@@ -3,8 +3,8 @@
 // If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
 // Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
 // Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
-#define VER_FILEVERSION     2,3,1
-#define VER_FILEVERSION_STR "2.3.1\0"
+#define VER_FILEVERSION     2,3,2
+#define VER_FILEVERSION_STR "2.3.2\0"

 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
Author	SHA1	Message	Date
isanae	1412befe1b	Merge pull request #1198 from isanae/2_3_0 Remove RC	2020-08-17 01:48:22 -04:00
isanae	e6e88074ea	removed rc	2020-08-17 01:42:11 -04:00
isanae	2388f2471b	Merge pull request #1195 from isanae/2_3_0 Cherry pick: die after dump	2020-08-13 14:48:35 -04:00
isanae	2c6c223cb0	bumped to 2.3.2rc2	2020-08-13 14:47:35 -04:00
isanae	f16738ffd6	always call the previous terminate handler, which should abort without it, execution just resumes and dumps are created endlessly	2020-08-13 14:46:47 -04:00
isanae	f2dc4ddd30	Merge pull request #1189 from isanae/2_3_0 switched to 2.3.2-rc1	2020-08-12 06:23:19 -04:00
isanae	322b5d59f0	switched to 2.3.2-rc1	2020-08-12 06:22:28 -04:00
isanae	06d356e48f	Merge pull request #1188 from isanae/2_3_0 bumped to 2.3.2	2020-08-12 04:26:19 -04:00
isanae	8db55c451c	bumped to 2.3.2	2020-08-12 04:24:48 -04:00
isanae	768e6291b3	Merge pull request #1183 from AnyOldName3/cherry-pick-NexusBridgeFix Cherry pick NexusBridge fix	2020-08-10 18:34:24 -04:00
AnyOldName3	2cdb7c5b13	Don't use reference as class member This particular QString was only ever constructed from a temporary, so it was literally never going to work. We only hadn't noticed this earlier as no one had tried using the mod repository bridge from a plugin before (which is fairly bad given that three people have theoretically tested it while working on its Python bindings in the past).	2020-08-08 14:18:14 +01:00