Merge lp:~compiz-team/compiz-core/oneiric.force_output_detection into lp:compiz-core/oneiric

[Sam Spilsbury]

Force output updates on redetection

[lp:~compiz-team/compiz-core/oneiric.force_output_detection]

2799. By Sam Spilsbury on 2011-09-02

Remove wrong code

[Sam Spilsbury (smspillaz)]

Alberto's branch works fine, no need for this one

Unmerged revisions

2799. By Sam Spilsbury on 2011-09-02

Remove wrong code

2798. By Sam Spilsbury on 2011-09-02

Force output device update on detection

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2011-08-23 08:02:43 +0000
+++ src/screen.cpp	2011-09-02 09:59:31 +0000
@@ -611,6 +611,8 @@
 	case CoreOptions::Outputs:
 	    if (!noDetection && optionGetDetectOutputs ())
 		return false;
+	    /* Update output devices directly since we read the
+	     * option directly in this function */
 	    updateOutputDevices ();
 	    break;
 	default:
@@ -1831,10 +1833,8 @@
 	mOptions[CoreOptions::DetectOutputs].value ().set (true);
 
     }
-    else
-    {
-	updateOutputDevices ();
-    }
+
+    updateOutputDevices ();
 }
 
 
@@ -4410,7 +4410,6 @@
     priv->reshape (priv->attrib.width, priv->attrib.height);
 
     priv->detectOutputDevices ();
-    priv->updateOutputDevices ();
 
     priv->getDesktopHints ();