Proper fix for the warning that Pavel noticed. The problem was that the local variabl...

And I of course also put back the semi-colon fix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30233 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c91b4a723b2417748e595288531d66f1b4d757ab..baa0c9122aacea3793b0d93d38cbf55b0888f66e 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -393,13 +393,13 @@ bool GuiView::restoreLayout()
        setLayoutDirection(qApp->layoutDirection());
 
        // Allow the toc and view-source dock widget to be restored if needed.
-       Dialog *d;
-       if ((d = findOrBuild("toc", true)));
+       Dialog * dialog;
+       if (dialog = findOrBuild("toc", true))
                // see bug 5082. At least setup title and enabled state.
                // Visibility will be adjusted by restoreState below.
-               d->prepareView();
-       if ((d = findOrBuild("view-source", true)))
-               d->prepareView();
+               dialog->prepareView();
+       if (dialog = findOrBuild("view-source", true))
+               dialog->prepareView();
 
        if (!restoreState(settings.value("layout").toByteArray(), 0))
                initToolbars();