diff options
Diffstat (limited to 'scribus/picstatus.cpp')
| -rw-r--r-- | scribus/picstatus.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scribus/picstatus.cpp b/scribus/picstatus.cpp index 22362cd..02e624a 100644 --- a/scribus/picstatus.cpp +++ b/scribus/picstatus.cpp @@ -377,7 +377,8 @@ void PicStatus::GotoPic() { if (currItem != NULL) { - ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor(); + if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode()) + ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor(); if (!currItem->OnMasterPage.isEmpty()) emit selectMasterPage(currItem->OnMasterPage); else @@ -390,7 +391,11 @@ void PicStatus::SelectPic() if (currItem == NULL) return; - ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor(); + if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode()) + ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor(); + else if (!currItem->OnMasterPage.isEmpty() && !currItem->doc()->masterPageMode()) + emit selectMasterPage(currItem->OnMasterPage); + if (currItem->Groups.count() == 0) emit selectElement(currItem->OwnPage, currItem->ItemNr, false); else |