Merge pull request #280 from pinotree/init-fix

TestTool::init: properly handle SDL::init errors
PerlGameDev · May 19, 2018 · 0f2af3b · 0f2af3b
2 parents 9081d02 + 39f3db9
commit 0f2af3b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/t/lib/SDL/TestTool.pm b/t/lib/SDL/TestTool.pm
@@ -20,6 +20,7 @@ sub init {
 	my ( $self, $init ) = @_;
 	my $stdout = '';
 	my $stderr = '';
+	my $result = 0;
 
 	if ( $init == SDL_INIT_VIDEO ) {
 		if ( $^O !~ /win/i && !$ENV{DISPLAY} && !$ENV{SDL_VIDEODRIVER} ) {
@@ -36,12 +37,12 @@ sub init {
 		SDL::quit();
 	}
 
-	($stdout, $stderr ) = capture { SDL::init($init) };
-	if ( $stderr ne '' ) {
+	($stdout, $stderr, $result ) = capture { SDL::init($init) };
+	if ( $result != 0 ) {
 		warn 'Init ' . $inits{$init} . ' failed with SDL error: ' . SDL::get_error() . "\nand stderr $stderr\n";
 	}
 
-	return !( $stderr ne '' );
+	return $result == 0;
 }
 
 sub test_audio_open {