widelands

Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands

  1. string-fixes
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8883
Proposed branch: lp:~widelands-dev/widelands/string-fixes
Merge into: lp:widelands
Diff against target: 24 lines (+2/-5)
1 file modified
src/graphic/gl/initialize.cc (+2/-5)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string-fixes
Reviewer Review Type Date Requested Status
Notabilis diff, testing Approve
Review via email: mp+356379@code.launchpad.net

Commit message

Improved error messages for gl initialize.

Description of the change

The error message for the shading language version is a bit misleading, so I did some rework. Also, the dialog box was too wide for my taste.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4107. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/439517974.
Appveyor build 3902. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3902.

Revision history for this message
Notabilis (notabilis27) wrote :

Changes sound good to me and output looks as expected.

review: Approve (diff, testing)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/graphic/gl/initialize.cc'
2--- src/graphic/gl/initialize.cc 2018-10-09 20:18:52 +0000
3+++ src/graphic/gl/initialize.cc 2018-10-10 07:05:34 +0000
4@@ -185,9 +185,7 @@
5 if (strcmp(shading_language_version_string, "(null)") == 0) {
6 log("ERROR: Unable to detect the shading language version!\n");
7 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
8- "Widelands won’t work because we were unable to detect the shading "
9- "language version -- there is an unknown problem with reading the "
10- "information from the graphics driver.",
11+ "Widelands won't work because we were unable to detect the shading language version.\nThere is an unknown problem with reading the information from the graphics driver.",
12 NULL);
13 exit(1);
14 }
15@@ -199,8 +197,7 @@
16 if (shading_language_version < 1.20) {
17 log("ERROR: Shading language version is too old!\n");
18 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
19- "Widelands won’t work because your graphics driver is too old -- "
20- "version 1.20 or newer is required.",
21+ "Widelands won’t work because your graphics driver is too old.\nThe Shading language needs to be version 1.20 or newer.",
22 NULL);
23 exit(1);
24 }

Subscribers

People subscribed via source and target branches

to status/vote changes: