File tree Expand file tree Collapse file tree 1 file changed +10
-4
lines changed
Expand file tree Collapse file tree 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)
10371037#ifdef WITH_XINERAMA
10381038 int xinerama_event = 0 ;
10391039 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 ;
10411044
10421045 if (!XineramaQueryExtension (subsystem -> display , & xinerama_event , & xinerama_error ))
10431046 return -1 ;
@@ -1271,7 +1274,12 @@ static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub)
12711274 return -1 ;
12721275
12731276 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 ;
12751283
12761284 if ((subsystem -> depth != 24 ) && (subsystem -> depth != 32 ))
12771285 {
@@ -1394,8 +1402,6 @@ static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub)
13941402 subsystem -> use_xshm );
13951403 }
13961404
1397- subsystem -> format = (ImageByteOrder (subsystem -> display ) == LSBFirst ) ? PIXEL_FORMAT_BGRX32
1398- : PIXEL_FORMAT_XRGB32 ;
13991405 return 1 ;
14001406}
14011407
You can’t perform that action at this time.
0 commit comments