Commit 05f31ba2 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf

qt: main_interface: Don't cache embedded-video setting

It is used uncached from other locations, which could cause inconsistant
state in the future (the setting is currently only read from the
constructor)

(cherry picked from commit d3e6d9da)
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 431093d3
......@@ -128,9 +128,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
setWindowIcon( QApplication::windowIcon() );
setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
/* Is video in embedded in the UI or not */
b_videoEmbedded = var_InheritBool( p_intf, "embedded-video" );
/* Does the interface resize to video size or the opposite */
b_autoresize = var_InheritBool( p_intf, "qt-video-autoresize" );
......@@ -485,7 +482,7 @@ void MainInterface::createMainWidget( QSettings *creationSettings )
bgWidget->setExpandstoHeight( true );
/* And video Outputs */
if( b_videoEmbedded )
if( var_InheritBool( p_intf, "embedded-video" ) )
{
videoWidget = new VideoWidget( p_intf, stackCentralW );
stackCentralW->addWidget( videoWidget );
......
......@@ -175,7 +175,6 @@ protected:
/* Flags */
unsigned i_notificationSetting; /// Systray Notifications
bool b_autoresize; ///< persistent resizable window
bool b_videoEmbedded; ///< Want an external Video Window
bool b_videoFullScreen; ///< --fullscreen
bool b_hideAfterCreation;
bool b_minimalView; ///< Minimal video
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment