diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 16:20:34 +0200 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 16:20:34 +0200 |
| commit | 595e641cf7fa72e091aff56f9eab360a9d9b636b (patch) | |
| tree | 44c530cb010308f37e42fa60622a3ffd1dd80a29 /src/xsane-front-gtk.c | |
| parent | f3a24cbe91087e885e469b77fe733d7c83437aa8 (diff) | |
| parent | 23337be110e44acd2f922fed0c92c5130abc1bba (diff) | |
Merge tag 'upstream/0.999'
Upstream version 0.999
# gpg: Signature made Fri 03 Oct 2014 04:20:30 PM CEST using RSA key ID B9444540
# gpg: Good signature from "Mattia Rizzolo <mattia@mapreri.org>"
# gpg: aka "Mattia Rizzolo <mapreri@ubuntu.com>"
# gpg: aka "Mattia Rizzolo <mapreri@ubuntu-it.org>"
# gpg: aka "Mattia Rizzolo <mapreri@gmail.com>"
# gpg: aka "[jpeg image of size 4456]"
# gpg: aka "[jpeg image of size 4218]"
Diffstat (limited to 'src/xsane-front-gtk.c')
| -rw-r--r-- | src/xsane-front-gtk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xsane-front-gtk.c b/src/xsane-front-gtk.c index 35aa89d..4c973fb 100644 --- a/src/xsane-front-gtk.c +++ b/src/xsane-front-gtk.c @@ -1709,7 +1709,7 @@ void xsane_update_param(void *arg) gtk_label_set(GTK_LABEL(xsane.info_label), buf); - if (xsane.preview->surface_unit == SANE_UNIT_MM) + if (xsane.preview && xsane.preview->surface_unit == SANE_UNIT_MM) { double dx, dy; @@ -1724,7 +1724,10 @@ void xsane_update_param(void *arg) xsane_update_histogram(TRUE /* update raw */); - preview_display_valid(xsane.preview); + if (xsane.preview) + { + preview_display_valid(xsane.preview); + } } /* ---------------------------------------------------------------------------------------------------------------------- */ |