Browse Source

Handle bad screen-root arguments in X11 mode

Still leaves a SIGABRT after the thrown exception from the logging
system.
Phantasm 3 years ago
parent
commit
d4c3ca3b44
1 changed files with 5 additions and 0 deletions
  1. 5 0
      src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp

+ 5 - 0
src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp

@@ -167,6 +167,11 @@ void CX11Output::loadScreenInfo ()
 
 
     XRRFreeScreenResources (screenResources);
     XRRFreeScreenResources (screenResources);
 
 
+    // Check if all screens from --screen-root are actually screens
+    if (this->m_viewports.size() != this->m_context.settings.general.screenBackgrounds.size()) {
+	    sLog.exception("Invalid screen in arguments.");
+    }
+
     // create pixmap so we can draw things in there
     // create pixmap so we can draw things in there
     this->m_pixmap = XCreatePixmap (this->m_display, this->m_root, this->m_fullWidth, this->m_fullHeight, 24);
     this->m_pixmap = XCreatePixmap (this->m_display, this->m_root, this->m_fullWidth, this->m_fullHeight, 24);
     this->m_gc = XCreateGC (this->m_display, this->m_pixmap, 0, nullptr);
     this->m_gc = XCreateGC (this->m_display, this->m_pixmap, 0, nullptr);