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

rcaelers · Jan 28, 2024 · b347f91 · b347f91
2 parents ddf1eb2 + 0a59025
commit b347f91
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/ui/app/toolkits/gtkmm/BreakWindow.cc b/ui/app/toolkits/gtkmm/BreakWindow.cc
@@ -79,8 +79,12 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app,
 #if defined(PLATFORM_OS_UNIX)
   if (Platform::running_on_wayland())
     {
-      window_manager = std::make_shared<WaylandWindowManager>();
-      window_manager->init();
+      auto wm = std::make_shared<WaylandWindowManager>();
+      bool success = wm->init();
+      if (success)
+        {
+          window_manager = wm;
+        }
     }
 #endif
 

diff --git a/ui/app/toolkits/gtkmm/PreludeWindow.cc b/ui/app/toolkits/gtkmm/PreludeWindow.cc
@@ -49,8 +49,12 @@ PreludeWindow::PreludeWindow(HeadInfo head, BreakId break_id)
 #if defined(PLATFORM_OS_UNIX)
   if (Platform::running_on_wayland())
     {
-      window_manager = std::make_shared<WaylandWindowManager>();
-      window_manager->init();
+      auto wm = std::make_shared<WaylandWindowManager>();
+      bool success = wm->init();
+      if (success)
+        {
+          window_manager = wm;
+        }
     }
 #endif
 

diff --git a/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.cc b/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.cc
@@ -103,8 +103,11 @@ void
 WaylandWindowManager::init_surface(Gtk::Widget &gtk_window, Glib::RefPtr<Gdk::Monitor> monitor, bool keyboard_focus)
 {
   TRACE_ENTRY();
-  auto layer = std::make_shared<LayerSurface>(layer_shell, gtk_window, monitor, keyboard_focus);
-  surfaces.push_back(layer);
+  if (layer_shell != nullptr)
+    {
+      auto layer = std::make_shared<LayerSurface>(layer_shell, gtk_window, monitor, keyboard_focus);
+      surfaces.push_back(layer);
+    }
 }
 
 void