diff --git a/0.74_My_PuTTY/version.h b/0.74_My_PuTTY/version.h index 265f3d9..edb0a70 100644 --- a/0.74_My_PuTTY/version.h +++ b/0.74_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.74 #define TEXTVER "Release 0.74" #define SSHVER "-Release-0.74" -#define BINARY_VERSION 0,74,4,12 +#define BINARY_VERSION 0,74,4,13 #define SOURCE_COMMIT "unavailable" diff --git a/0.74_My_PuTTY/windows/version_minor.txt b/0.74_My_PuTTY/windows/version_minor.txt index 48082f7..b1bd38b 100644 --- a/0.74_My_PuTTY/windows/version_minor.txt +++ b/0.74_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -12 +13 diff --git a/docs/version.txt b/docs/version.txt index c1e297d..62ed406 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.74.4.12 \ No newline at end of file +0.74.4.13 \ No newline at end of file diff --git a/kitty.c b/kitty.c index 9f8f17b..7558777 100644 --- a/kitty.c +++ b/kitty.c @@ -5442,29 +5442,34 @@ void InitNameConfigFile( void ) { if( !existfile( buffer ) ) { sprintf( buffer, "%s\\putty.ini", InitialDirectory ) ; if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_INIT_FILE ) ; - if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\%s", getenv("APPDATA"), INIT_SECTION ) ; - CreateDirectory( buffer, NULL ) ; + if( IniFileFlag != SAVEMODE_DIR ) { sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_INIT_FILE ) ; + if( !existfile( buffer ) ) { + sprintf( buffer, "%s\\%s", getenv("APPDATA"), INIT_SECTION ) ; + CreateDirectory( buffer, NULL ) ; + sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_INIT_FILE ) ; } + } else { + sprintf( buffer, "%s\\%s", InitialDirectory, DEFAULT_INIT_FILE ) ; } } } - + } KittyIniFile=(char*)malloc( strlen( buffer)+2 ) ; strcpy( KittyIniFile, buffer) ; if( KittySavFile != NULL ) { free( KittySavFile ) ; } KittySavFile=NULL ; sprintf( buffer, "%s\\%s", InitialDirectory, DEFAULT_SAV_FILE ) ; if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_SAV_FILE ) ; - if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\%s", getenv("APPDATA"), INIT_SECTION ) ; - CreateDirectory( buffer, NULL ) ; + if( IniFileFlag != SAVEMODE_DIR ) { sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_SAV_FILE ) ; + if( !existfile( buffer ) ) { + sprintf( buffer, "%s\\%s", getenv("APPDATA"), INIT_SECTION ) ; + CreateDirectory( buffer, NULL ) ; + sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_SAV_FILE ) ; } } + } KittySavFile=(char*)malloc( strlen( buffer)+2 ) ; strcpy( KittySavFile, buffer) ; sprintf( buffer, "%s\\kitty.dft", InitialDirectory ) ;