diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-05-17 22:13:58 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-05-17 22:13:58 +0000 |
| commit | 4e972b169a1c46478a79f96103d84bdf0e55f566 (patch) | |
| tree | 0916cc133f08b180914d7f2cf34f05aad78930ce | |
| parent | 3e9e2fd2d67b28cec43e4b20dd61a22d1ce9d021 (diff) | |
| download | scribus-4e972b169a1c46478a79f96103d84bdf0e55f566.tar.gz scribus-4e972b169a1c46478a79f96103d84bdf0e55f566.tar.xz scribus-4e972b169a1c46478a79f96103d84bdf0e55f566.zip | |
#10713: Crash on master pages when managing images
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17509 11d20701-8431-0410-a711-e3c959e3b870
| -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 |