r18098 by craig - Fix typo, and fix #11375 with included patch

[scribus-commit]

Author: craig
Date: Thu Jan 17 21:24:04 2013
New Revision: 18098

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18098
Log:
Fix typo, and fix #11375 with included patch

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18098&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Jan 17 21:24:04 2013
@@ -290,7 +290,7 @@
 		} // if(OnMasterPage.isEmpty()		
 	} // if(!Embedded)
 	else
-		qDebug() << "QRegion epmty";
+		qDebug() << "QRegion empty";
 	return result;
 }
 
@@ -4008,7 +4008,7 @@
 	nextItem->asTextFrame()->deleteSelectedTextFromFrame();
 	if (!isNoteFrame())
 	{
-		if(UndoManager::undoEnabled())
+		if(UndoManager::undoEnabled() && undoManager->getLastUndo())
 			undoManager->getLastUndo()->setName(Um::ClearText);
 		nextItem->itemText.setDefaultStyle(defaultStyle);
 	}