[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Bug 92781 - the Real Fix (forget about the previous fix attempt)


  M +2 -2      umldoc.cpp   1.201
  M +3 -0      umlwidget.cpp   1.109


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.200:1.201
@@ -2678,6 +2678,6 @@ void UMLDoc::loadUndoData() {
                 m_bLoading = true;
                 deleteContents();
-                QDataStream* undoData = undoStack.take( 0 );
-                redoStack.prepend( undoData );
+                redoStack.prepend( undoStack.take(0) );
+                QDataStream* undoData = undoStack.getFirst();
                 QBuffer* buffer = static_cast<QBuffer*>( undoData->device() );
                 buffer->open(IO_ReadOnly);

--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.108:1.109
@@ -503,5 +503,8 @@ void UMLWidget::slotMenuSelection(int se
                         font = getFont();
                         if( KFontDialog::getFont( font, false, m_pView ) )
+                        {
                                 setFont( font );
+                                m_pDoc->setModified(true);
+                        }
                         break;