diff options
| author | François Andriot <francois.andriot@free.fr> | 2017-07-23 19:43:12 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-23 19:43:25 +0200 |
| commit | 792207bf14d54e25f87320fdfc42ddf4a31763c4 (patch) | |
| tree | d74e56e83549563759021b93acdd086a8e594290 | |
| parent | 0ad3ef7c5a42efe7537410f518436ff32d9c2149 (diff) | |
| download | tdebase-792207bf14d54e25f87320fdfc42ddf4a31763c4.tar.gz tdebase-792207bf14d54e25f87320fdfc42ddf4a31763c4.zip | |
Fix FTBFS with GCC7
Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit cd2fc7ba9120fac49ebe6ceaee51bc8eaf802d05)
| -rw-r--r-- | twin/client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/client.cpp b/twin/client.cpp index 65818899b..ce7461b36 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -509,7 +509,7 @@ bool Client::isModalSystemNotification() const int format, result; unsigned long n, left; result = XGetWindowProperty(tqt_xdisplay(), window(), atoms->net_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); - if (result == Success && data != None && format == 32 ) + if (result == Success && data && format == 32 ) { return TRUE; } @@ -2975,7 +2975,7 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr int format, result; unsigned long n, left; result = XGetWindowProperty(tqt_xdisplay(), window(), atoms->net_wm_window_opacity, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); - if (result == Success && data != None && format == 32 ) + if (result == Success && data && format == 32 ) { opacity_ = *reinterpret_cast< long* >( data ); custom_opacity = true; |