Backing out r347 and r345. Keeping r346.

[xonotic/netradiant.git] / radiant / preferences.cpp

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index f44aca8a16e33ec3ad179de0536c676d00cfbabd..9a71c25b95c7a474f08bc39547949d454af8b7de 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -39,10 +39,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "missing.h"
 #include "gtkmisc.h"
 
-#ifdef _WIN32
-#undef fprintf
-#endif
-
 #ifdef _WIN32
 #include <io.h>
 #define X_OK 0
@@ -3363,7 +3359,7 @@ void CGameInstall::BuildDialog() {
 
 void CGameInstall::Run() {
        ScanGames();
-       if ( m_availGames[0] == GAME_NONE ) {
+       if (m_availGames[0] == GAME_NONE) {
                return;
        }
        if ( DoModal() == IDCANCEL ) {
@@ -3379,8 +3375,8 @@ void CGameInstall::Run() {
        gameFilePath += ".game";
        Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() );
 
-       FILE * fg = fopen( gameFilePath.GetBuffer(), "w" );
-       if ( fg == NULL ) {
+       FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
+       if ( fg == NULL || ferror( fg ) ) {
                Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
        }
        fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );