PAL10669 - there are no toolbars if runSalome with deleted file of user preferences...

diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 41b5bbee79e21bbb5a1b59cc1ee2f89fbe75397a..39c197fb678a7ec09a15f0debc55990ce40ab2a2 100644 (file)
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -226,15 +226,14 @@ void QtxMainWindow::loadGeometry( QtxResourceMgr* resMgr, const QString& section
 
   myMode = winState;
 
-  vis ? show() : hide();
+  vis ? showWithMode() : hide();
 }
 
-void QtxMainWindow::show()
+void QtxMainWindow::showWithMode()
 {
   int mode = myMode;
 
   myMode = -1;
-
   switch ( mode )
   {
   case WS_Normal:
@@ -247,8 +246,6 @@ void QtxMainWindow::show()
     showMaximized();
     break;
   }
-
-  QMainWindow::show();
 }
 
 int QtxMainWindow::relativeCoordinate( const int type, const int WH, const int wh ) const

diff --git a/src/Qtx/QtxMainWindow.h b/src/Qtx/QtxMainWindow.h
index 3d9a1922c47291d8bebf8c5e6a32336fe63c763d..63689d30e069782f3af3572d7e5ce9918620c6d6 100644 (file)
--- a/src/Qtx/QtxMainWindow.h
+++ b/src/Qtx/QtxMainWindow.h
@@ -54,7 +54,6 @@ public:
   virtual bool      eventFilter( QObject*, QEvent* );
 
 public slots:
-  virtual void      show();
   virtual void      setAppropriate( QDockWindow*, bool );
 
 protected:
@@ -67,6 +66,7 @@ private:
   int               windowState( const QString& ) const;
   int               windowPosition( const QString& ) const;
   int               relativeCoordinate( const int, const int, const int ) const;
+  void              showWithMode();
 
 private:
   int               myMode;