Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index b881f3d78f55f3c383c1ffbaa09bfe24008f2650..8abf695a2b2db0628e6056060f07d2da9059fddf 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -224,7 +224,6 @@ LyX::LyX()
 {
        singleton_ = this;
        pimpl_.reset(new Singletons);
-       geometryArg.clear();
 }
 
 
@@ -635,7 +634,7 @@ LyXView * LyX::newLyXView()
        unsigned int height = 510;
        // default icon size, will be overwritten by  stored session value
        unsigned int iconSizeXY = 0;
-       bool maximize = false;
+       int maximized = LyXView::NotMaximized;
        // first try lyxrc
        if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
                width = lyxrc.geometry_width;
@@ -649,8 +648,9 @@ LyXView * LyX::newLyXView()
                val = session().sessionInfo().load("WindowHeight");
                if (!val.empty())
                        height = convert<unsigned int>(val);
-               if (session().sessionInfo().load("WindowIsMaximized") == "yes")
-                       maximize = true;
+               val = session().sessionInfo().load("WindowMaximized");
+               if (!val.empty())
+                       maximized = convert<int>(val);
                val = session().sessionInfo().load("IconSizeXY");
                if (!val.empty())
                        iconSizeXY = convert<unsigned int>(val);
@@ -675,7 +675,7 @@ LyXView * LyX::newLyXView()
        }
 
        // create the main window
-       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize, iconSizeXY, geometryArg);
+       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximized, iconSizeXY, geometryArg);
 
        return view;
 }