1 files changed, 7 insertions, 0 deletions
diff --git a/src/openbox.hh b/src/openbox.hh
index 40eb1804..1489ffb7 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -171,9 +171,16 @@ public:
   //! Returns a managed screen
   inline OBScreen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
+    if (num >= screenCount())
+      return NULL;
     return _screens[num];
   }
 
+  //! Returns the number of managed screens
+  inline int screenCount() const {
+    return (signed)_screens.size();
+  }
+
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }