r16035 by craig - Fix OSX crash in scmenu

[scribus-commit]

Author: craig
Date: Mon Nov 29 22:50:29 2010
New Revision: 16035

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16035
Log:
Fix OSX crash in scmenu

Modified:
    trunk/Scribus/scribus/ui/scmenu.cpp

Modified: trunk/Scribus/scribus/ui/scmenu.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16035&path=/trunk/Scribus/scribus/ui/scmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/scmenu.cpp Mon Nov 29 22:50:29 2010
@@ -197,8 +197,9 @@
 	//	return false;
 	
 #ifdef Q_WS_MAC
-	if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
-		newMenuAction->setIcon(loadIcon("noicon.xpm"));
+	if (newMenuAction && afterMenuAction)
+		if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
+			newMenuAction->setIcon(loadIcon("noicon.xpm"));
 #endif
 		
 	int pos=menuItemList.indexOf(QPointer<QObject>(afterMenuAction));