Merge branch 'main' of github.com:rcaelers/workrave

rcaelers · rcaelers · commit 85ee93248218 · 2022-11-07T20:38:38.000+01:00
diff --git a/ui/app/Application.cc b/ui/app/Application.cc
@@ -65,7 +65,9 @@ Application::Application(int argc, char **argv, std::shared_ptr<IToolkitFactory>
 Application::~Application()
 {
   TRACE_ENTRY();
+#if !defined(HAVE_CORE_NEXT)
   core->set_core_events_listener(nullptr);
+#endif
   core.reset();
 
   if (toolkit)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,9 @@ Application::Application(int argc, char **argv, std::shared_ptr<IToolkitFactory>`
`65`	`65`	`Application::~Application()`
`66`	`66`	`{`
`67`	`67`	`TRACE_ENTRY();`
	`68`	`+#if !defined(HAVE_CORE_NEXT)`
`68`	`69`	`core->set_core_events_listener(nullptr);`
	`70`	`+#endif`
`69`	`71`	`core.reset();`
`70`	`72`
`71`	`73`	`if (toolkit)`