Skip to content

Commit

Permalink
Fixed crash on a race condition with frequently View resizing.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddroom committed Aug 9, 2015
1 parent 4f008e7 commit f4332f1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

1.0.0.2 - Fixed crash on a race condition with frequently View resizing.
1.0.0.1 - Fixed broken (on some OS like Windows 10 etc.) versions system.

2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

#define APP_NAME "DDRoom"
#define APP_NAME_FULL "Digital Dark Room"
#define APP_VERSION "1.0.0.0"
#define APP_VERSION "1.0.0.2"

#endif //__H_VERSION__
11 changes: 8 additions & 3 deletions src/view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1650,10 +1650,15 @@ cerr << "ERROR: receive_tile(): image->thumb_area stil not empty" << endl;
edit->update_thumbnail((void *)this, thumbnail);
} else {
// image->lock.lock();
// TODO: put tile at appropriate place here
image->tiles_areas[tile->index] = tile->area;
bool update = (tile->index >= 0 && tile->index < image->tiles_areas.size());
if(update)
image->tiles_areas[tile->index] = tile->area;
else // apparently request with this tile as result was discarded
if(tile->area != NULL)
delete tile->area;
image->lock.unlock();
emit update_image();
if(update)
emit update_image();
}
}

Expand Down

0 comments on commit f4332f1

Please sign in to comment.