Backing out r347 and r345. Keeping r346.

So, this branch is now r344 with patch r346.
DO NOT MERGE THIS CHANGE INTO TRUNK!!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
rambetter
2010-12-15 06:56:33 +00:00
parent ab7d2b5680
commit 7f2f9610ba
28 changed files with 57 additions and 79 deletions

View File

@@ -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" );