diff options
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index dd77bfc4fd5..2aceabcea76 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1500,8 +1500,18 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) if (sl->next) { /* specific checks for space types */ + + int sima_restore = 0; + + /* Special check added for non-render image window (back from fullscreen through "Back to Previous" button) */ if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima= sa->spacedata.first; + if (!(sima->flag & SI_PREVSPACE) && !(sima->flag & SI_FULLWINDOW)) + sima_restore = 1; + } + + if (sl->spacetype == SPACE_IMAGE && !sima_restore) { + SpaceImage *sima= sa->spacedata.first; if (sima->flag & SI_PREVSPACE) sima->flag &= ~SI_PREVSPACE; if (sima->flag & SI_FULLWINDOW) { |