[vlc-devel] commit: Don't save geometry if Video is Active. (Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Aug 25 16:02:06 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 24 19:12:00 2008 -0700| [4106fd11cd0f15a712ae39709fcc07f0fc0d3222] | committer: Christophe Mutricy 

Don't save geometry if Video is Active.

Close #1775
(cherry picked from commit 0fba573281060a64c512de99499d0f71982c42db)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4106fd11cd0f15a712ae39709fcc07f0fc0d3222
---

 modules/gui/qt4/main_interface.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index e04b5b6..f5cd1d9 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -258,7 +258,13 @@ MainInterface::~MainInterface()
                         getControlsVisibilityStatus() & CONTROLS_ADVANCED );
 
     if( !videoIsActive )
+    {
         QVLCTools::saveWidgetPosition(settings, this);
+    }
+    else
+    {
+        msg_Dbg( p_intf, "Not saving because video is in use." );
+    }
 
     if( bgWidget )
         settings->setValue( "backgroundSize", bgWidget->size() );
@@ -677,6 +683,8 @@ void MainInterface::releaseVideoSlot( void *p_win )
         bgWidget->show();
     }
 
+    videoIsActive = false;
+
     /* Try to resize, except when you are in Fullscreen mode */
     if( !isFullScreen() ) doComponentsUpdate();
 }




More information about the vlc-devel mailing list