gfxlib: Return proper error code from Screen (98fec3c regression)

dkl · dkl · commit 957897421cb5 · 2015-04-25T19:07:28.000+02:00
(cherry picked from commit 3d027c5)
diff --git a/changelog.txt b/changelog.txt
@@ -17,6 +17,7 @@ Version 1.02.1
 - #767: Illegal byref result assignments will now cause a proper error message, not just a warning
 - Using the -asm att|intel option for non-x86[_64] targets now triggers an error
 - C backend: -masm=... will now only be passed to gcc for x86[_64] targets
+- Screen didn't return an error code if it failed
 
 
 Version 1.02.0
diff --git a/src/gfxlib2/gfx_screen.c b/src/gfxlib2/gfx_screen.c
@@ -437,7 +437,7 @@ FBCALL int fb_GfxScreen
 
 	FB_GRAPHICS_UNLOCK( );
 
-	return fb_ErrorSetNum( FB_RTERROR_OK );
+	return res;
 }
 
 FBCALL int fb_GfxScreenQB( int mode, int visible, int active )

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ FBCALL int fb_GfxScreen`
`437`	`437`
`438`	`438`	`FB_GRAPHICS_UNLOCK( );`
`439`	`439`
`440`		`- return fb_ErrorSetNum( FB_RTERROR_OK );`
	`440`	`+ return res;`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`FBCALL int fb_GfxScreenQB( int mode, int visible, int active )`