X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FToolbar_pimpl.C;h=db5c7d0a0bccfaca4698faf8f670ea4c3d3d224d;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=b13eea114ec8e6f182d6d692aa5175d11c726c4d;hpb=e7401bd8f2310213b4b765c01676459f37adb530;p=lyx.git

diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index b13eea114e..db5c7d0a0b 100644
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -120,13 +120,13 @@ int BubblePost(FL_OBJECT *ob, int event,
 	FL_OBJECT * bubble_timer = reinterpret_cast<FL_OBJECT *>(ob->u_cdata);
 	
 	// We do not test for empty help here, since this can never happen
-	if(event == FL_ENTER){
+	if (event == FL_ENTER){
 		fl_set_object_callback(bubble_timer,
 				       C_Toolbar_BubbleTimerCB,
 				       reinterpret_cast<long>(ob));
 		fl_set_timer(bubble_timer, 1);
 	}
-	else if(event != FL_MOTION){
+	else if (event != FL_MOTION){
 		fl_set_timer(bubble_timer, 0);
 		fl_hide_oneliner();
 	}
@@ -252,7 +252,7 @@ void ToolbarCB(FL_OBJECT * ob, long ac)
 	LyXView * owner = static_cast<LyXView *>(ob->u_vdata);
 	
 	string res = owner->getLyXFunc()->Dispatch(int(ac));
-	if(!res.empty())
+	if (!res.empty())
 		lyxerr[Debug::GUI] << "ToolbarCB: Function returned: " 
 				   << res << endl;
 }
@@ -306,12 +306,16 @@ void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) {
 	}
 
 	if (act == LFUN_INSERT_MATH && !arg.empty()) {
-		lyxerr[Debug::GUI] << "Using mathed-provided icon" << endl;
 		char const ** pixmap = get_pixmap_from_symbol(arg.c_str(),
 							buttonwidth,
 							height);
-		fl_set_pixmapbutton_data(obj, const_cast<char **>(pixmap));
-		return;
+		if (pixmap) {
+			lyxerr[Debug::GUI] << "Using mathed-provided icon"
+					   << endl;
+			fl_set_pixmapbutton_data(obj,
+						 const_cast<char **>(pixmap));
+			return;
+		}
 	}
 	
 	lyxerr << "Unable to find icon `" << xpm_name << "'" << endl;
@@ -345,7 +349,7 @@ void Toolbar::Pimpl::set(bool doingmain)
 	ToolbarList::iterator item = toollist.begin();
 	ToolbarList::iterator end = toollist.end();
 	for (; item != end; ++item) {
-		switch(item->action){
+		switch (item->action){
 		case ToolbarDefaults::SEPARATOR:
 			xpos += sepspace;
 			break;