File tree 1 file changed +10
-4
lines changed
1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -1037,7 +1037,10 @@ static int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem)
1037
1037
#ifdef WITH_XINERAMA
1038
1038
int xinerama_event = 0 ;
1039
1039
int xinerama_error = 0 ;
1040
- x11_shadow_subsystem_base_init (subsystem );
1040
+
1041
+ const int rc = x11_shadow_subsystem_base_init (subsystem );
1042
+ if (rc < 0 )
1043
+ return rc ;
1041
1044
1042
1045
if (!XineramaQueryExtension (subsystem -> display , & xinerama_event , & xinerama_error ))
1043
1046
return -1 ;
@@ -1271,7 +1274,12 @@ static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub)
1271
1274
return -1 ;
1272
1275
1273
1276
subsystem -> common .numMonitors = x11_shadow_enum_monitors (subsystem -> common .monitors , 16 );
1274
- x11_shadow_subsystem_base_init (subsystem );
1277
+ const int rc = x11_shadow_subsystem_base_init (subsystem );
1278
+ if (rc < 0 )
1279
+ return rc ;
1280
+
1281
+ subsystem -> format = (ImageByteOrder (subsystem -> display ) == LSBFirst ) ? PIXEL_FORMAT_BGRA32
1282
+ : PIXEL_FORMAT_ARGB32 ;
1275
1283
1276
1284
if ((subsystem -> depth != 24 ) && (subsystem -> depth != 32 ))
1277
1285
{
@@ -1394,8 +1402,6 @@ static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub)
1394
1402
subsystem -> use_xshm );
1395
1403
}
1396
1404
1397
- subsystem -> format = (ImageByteOrder (subsystem -> display ) == LSBFirst ) ? PIXEL_FORMAT_BGRX32
1398
- : PIXEL_FORMAT_XRGB32 ;
1399
1405
return 1 ;
1400
1406
}
1401
1407
You can’t perform that action at this time.
0 commit comments