removed goto

2 files changed, 17 insertions, 13 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 16f39b1..a97f1aa 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1963,21 +1963,23 @@ WinClient *BScreen::findGroupRight(WinClient &winclient) {
 
     return other;
 }
+void BScreen::clearXinerama() {
+#ifdef DEBUG
+    cerr<<"BScreen::initXinerama(): dont have Xinerama"<<endl;
+#endif // DEBUG
+    m_xinerama_avail = false;
+    if (m_xinerama_headinfo)
+        delete [] m_xinerama_headinfo;
+    m_xinerama_headinfo = 0;
+    m_xinerama_num_heads = 0;
+}
 
 void BScreen::initXinerama() {
 #ifdef XINERAMA
     Display *display = FbTk::App::instance()->display();
 
     if (!XineramaIsActive(display)) {
-notactive:
-#ifdef DEBUG
-        cerr<<"BScreen::initXinerama(): dont have Xinerama"<<endl;
-#endif // DEBUG
-        m_xinerama_avail = false;
-        if (m_xinerama_headinfo)
-            delete [] m_xinerama_headinfo;
-        m_xinerama_headinfo = 0;
-        m_xinerama_num_heads = 0;
+        clearXinerama();
         return;
     }
 #ifdef DEBUG
@@ -1993,10 +1995,9 @@ notactive:
      * Xinerama, fall back to turning it off. If not, pretend nothing
      * happened -- another event will tell us and it will work then. */
     if (!screen_info) {
-        if (m_xinerama_headinfo)
-            return;
-        else
-            goto notactive;
+        if (!m_xinerama_headinfo)
+            clearXinerama();
+        return;
     }
 
     if (m_xinerama_headinfo)
diff --git a/src/Screen.hh b/src/Screen.hh
index f0dbcc6..d42fea0 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -407,6 +407,9 @@ public:
 
     void initXinerama();
     void clearHeads();
+    /// clean up xinerama
+    void clearXinerama();
+
     /**
      * Determines head number for a position
      * @param x position in pixels on the screen