[vlc-commits] qt: fix playlist docked initial status is undefined

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Jul 30 09:54:12 2019 +0200| [c7544f969fcb22022cc8eafbb7d3af51fa8526af] | committer: Jean-Baptiste Kempf

qt: fix playlist docked initial status is undefined

docked state was read from b_playlistDocked while
  b_plDocked was read from configuration.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt/main_interface.cpp | 4 ++--
 modules/gui/qt/main_interface.hpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 6b633dea55..4d83b3fda1 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -163,7 +163,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ),
     settings = getSettings();
 
     /* */
-    b_plDocked = getSettings()->value( "MainWindow/pl-dock-status", true ).toBool();
+    b_playlistDocked = getSettings()->value( "MainWindow/pl-dock-status", true ).toBool();
 
     /* Should the UI stays on top of other windows */
     b_interfaceOnTop = var_InheritBool( p_intf, "video-on-top" );
@@ -254,7 +254,7 @@ MainInterface::~MainInterface()
     /* Save states */
 
     settings->beginGroup("MainWindow");
-    settings->setValue( "pl-dock-status", b_plDocked );
+    settings->setValue( "pl-dock-status", b_playlistDocked );
 
     /* Save playlist state */
     settings->setValue( "playlist-visible", playlistVisible );
diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/main_interface.hpp
index d15a47405d..b93e075f40 100644
--- a/modules/gui/qt/main_interface.hpp
+++ b/modules/gui/qt/main_interface.hpp
@@ -189,7 +189,6 @@ protected:
     bool                 playlistVisible;       ///< Is the playlist visible ?
 //    bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
 //    bool                 b_visualSelectorEnabled;
-    bool                 b_plDocked;            ///< Is the playlist docked ?
 
     bool                 b_hasPausedWhenMinimized;