X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=5b913c99ac8d2df2e997aff4c4494810fbc65b19;hb=fb424bae1b693200ba4a506b2775929d25d77be3;hp=97ab981e68bd215e78dda7eddb8353f351587a80;hpb=7aebbe6e10b3b4cf1f110b98c73a0a27059da6d8;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index 97ab981e68..5b913c99ac 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -111,7 +111,6 @@ void LyXView::setLayout(layout_type layout)
 void LyXView::updateToolbar()
 {
 	toolbar->update();
-	menubar->update();
 }
 
 
@@ -158,6 +157,7 @@ void LyXView::updateMenubar()
 		menubar->set("main_nobuffer");
 	else
 		menubar->set("main");
+	menubar->update();
 }
 
 
@@ -222,6 +222,7 @@ void LyXView::updateWindowTitle()
 {
 	static string last_title = "LyX";
 	string title = "LyX";
+	string icon_title = "LyX";
 
 	if (view()->available()) {
 		string const cur_title = buffer()->fileName();
@@ -231,19 +232,18 @@ void LyXView::updateWindowTitle()
 				title += _(" (Changed)");
 			if (buffer()->isReadonly())
 				title += _(" (read only)");
+			/* Show only the filename if it's available. */
+			icon_title = OnlyFilename(cur_title);
 		}
 	}
 	if (title != last_title) {
-		setWindowTitle(title);
+		setWindowTitle(title, icon_title);
 		last_title = title;
 	}
-	last_title = title;
 }
 
 
 void LyXView::showState()
 {
 	message(currentState(view()));
-	getToolbar()->update();
-	menubar->update();
 }