liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple Editor Tabs in separate window: crash when closing tab while (image update) processing is running, Issue 2587

Browse Source
This commit is contained in:
Ingo
2014-11-27 19:49:08 +01:00
parent c381db2f1f
commit fb6861e481
6 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/editwindow.cc
View File

@@ -35,20 +35,18 @@ bool EditWindow::isMultiDisplayEnabled() {
EditWindow* EditWindow::getInstance(RTWindow* p)
{
if ( editWnd == NULL )
{
if (editWnd == NULL) {
static MyMutex smutex_;
MyMutex::MyLock lock(smutex_);
if ( editWnd == 0 )
{
if ( editWnd == 0 ) {
editWnd = new EditWindow(p);
// Determine the other display and maximize the window on that
const Glib::RefPtr< Gdk::Window >& wnd=p->get_window();
int monNo=p->get_screen()->get_monitor_at_window (wnd);
Gdk::Rectangle lMonitorRect;
editWnd->get_screen()->get_monitor_geometry(monNo==0 ? 1:0, lMonitorRect);
Gdk::Rectangle lMonitorRect;
editWnd->get_screen()->get_monitor_geometry(isMultiDisplayEnabled() ? (monNo==0 ? 1 : 0) : monNo, lMonitorRect);
editWnd->move(lMonitorRect.get_x(), lMonitorRect.get_y());
editWnd->maximize();
editWnd->show();
@@ -158,7 +156,10 @@ void EditWindow::addEditorPanel (EditorPanel* ep, const std::string &name) {
ep->setAspect();
}
void EditWindow::remEditorPanel (EditorPanel* ep) {
void EditWindow::remEditorPanel (EditorPanel* ep) {
if (ep->getIsProcessing())
return; // Will crash if destroyed while loading
epanels.erase (ep->getFileName());
filesEdited.erase (ep->getFileName ());
parent->fpanel->refreshEditedState (filesEdited);
@@ -220,8 +221,8 @@ bool EditWindow::on_delete_event(GdkEventAny* event) {
if (epanels[*iter]->getIsProcessing()) isProcessing=true;
}
if (isProcessing) return false;
if (isProcessing)
return true;
for ( std::set <Glib::ustring>::iterator iter = filesEdited.begin(); iter != filesEdited.end(); iter++ )
mainNB->remove_page (*epanels[*iter]);
@@ -232,7 +233,7 @@ bool EditWindow::on_delete_event(GdkEventAny* event) {
parent->fpanel->refreshEditedState (filesEdited);
hide ();
return true;
return false;
}
void EditWindow::set_title_decorated(Glib::ustring fname){