kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.12'

Browse source
This commit is contained in:
Dawit Alemayehu 2014-01-01 14:56:38 -05:00
commit 10105d94fc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
konqueror/src/konqundomanager.cpp
View file

@ -130,7 +130,7 @@ void KonqUndoManager::undo()
KonqClosedItem* closedItem = m_closedItemList.first();
// Check what to undo
if (!m_supportsFileUndo || !KIO::FileUndoManager::self()->undoAvailable() || closedItem->serialNumber() > fileUndoManager->currentCommandSerialNumber()) {
if (!m_supportsFileUndo || !fileUndoManager->undoAvailable() || closedItem->serialNumber() > fileUndoManager->currentCommandSerialNumber()) {
undoClosedItem(0);
return;
}
@ -209,13 +209,13 @@ void KonqUndoManager::undoClosedItem(int index)
if(closedTabItem)
emit openClosedTab(*closedTabItem);
else if(closedRemoteWindowItem) {
emit openClosedWindow(*closedRemoteWindowItem);
KonqClosedWindowsManager::self()->removeClosedWindowItem(this, closedRemoteWindowItem);
emit openClosedWindow(*closedRemoteWindowItem);
} else if(closedWindowItem) {
emit openClosedWindow(*closedWindowItem);
KonqClosedWindowsManager::self()->removeClosedWindowItem(this, closedWindowItem);
emit openClosedWindow(*closedWindowItem);
closedWindowItem->configGroup().deleteGroup();
// Save config so that this window won't appear in new konqueror processes
KonqClosedWindowsManager::self()->saveConfig();
}