--- a/QTfrontend/pages.cpp	Wed Oct 27 14:02:20 2010 +0200
+++ b/QTfrontend/pages.cpp	Wed Oct 27 14:23:47 2010 +0200
@@ -778,6 +778,12 @@
 
 void PageOptions::setFullscreen(void)
 {
+    int tmp = this->CBResolution->currentIndex();
+    if (this->CBFullscreen->isChecked())
+        this->CBResolution->setCurrentIndex(0);
+    else
+        this->CBResolution->setCurrentIndex(previousResolutionIndex);
+    previousResolutionIndex = tmp;
     this->CBResolution->setEnabled(!this->CBFullscreen->isChecked());
 }
 

--- a/QTfrontend/pages.h	Wed Oct 27 14:02:20 2010 +0200
+++ b/QTfrontend/pages.h	Wed Oct 27 14:23:47 2010 +0200
@@ -243,7 +243,10 @@
     QLineEdit *editNetNick;
     QSlider *SLQuality;
     QCheckBox *CBFrontendEffects;
+
+private:
     bool previousFullscreenValue;
+    int previousResolutionIndex;
 
 private slots:
     void forceFullscreen(int index);