(trunk, gtk) #4573 'fix crash when opening a torrent file on systems that don't defin...

diff --git a/NEWS b/NEWS
index 9a210c0ead6a25194c1ed66012dead49bb8a288f..955f7b0f7f624c9c67c8b2b697339b47faa5a8c6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
   * Raise the number formatter limits for configuration options
   * Fix regression that ignored user-specified TRANSMISSION_HOME environment
 ==== GTK+ ====
+  * Fix crash when adding torrents on systems without G_USER_DIRECTORY_DOWNLOAD
   * Honor the notification sound setting
   * Add a tooltip to files in the torrents' file list
   * Fix broken handling of the Cancel button in the "Open URL" dialog

diff --git a/gtk/conf.c b/gtk/conf.c
index a3f8860a7cc8c95494d41e748974bf9dac03f7b0..e158b7a60cb3875bf7f9517d308e842bc50eb8c2 100644 (file)
--- a/gtk/conf.c
+++ b/gtk/conf.c
@@ -67,6 +67,7 @@ static void
 tr_prefs_init_defaults( tr_benc * d )
 {
     const char * str;
+    const char * special_dl_dir = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
 
     cf_check_older_configs( );
 
@@ -106,8 +107,7 @@ tr_prefs_init_defaults( tr_benc * d )
     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 );
     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 );
 
-    str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
-    tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str );
+    tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, special_dl_dir ? special_dl_dir : str );
 
     tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
     tr_bencDictAddBool( d, PREF_KEY_SORT_REVERSED, FALSE );