From 7d266ed4d64ecdc6e1be5c1b9504d5bd8b1a5aa0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 5 Jan 2010 23:23:26 +0000 Subject: [PATCH] (trunk gtk) #2728 "Creates auto-download dir when non-existant" -- fixed for 1.80 --- gtk/main.c | 2 -- gtk/tr-core.c | 17 ++++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index 04dc7b2ad..4f71bbd0c 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -588,8 +588,6 @@ main( int argc, char ** argv ) sighandler_cbdata = cbdata; /* ensure the directories are created */ - if(( str = pref_string_get( PREF_KEY_DIR_WATCH ))) - gtr_mkdir_with_parents( str, 0777 ); if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR ))) gtr_mkdir_with_parents( str, 0777 ); if(( str = pref_string_get( TR_PREFS_KEY_INCOMPLETE_DIR ))) diff --git a/gtk/tr-core.c b/gtk/tr-core.c index 3ed45cc8f..e2c00b1ee 100644 --- a/gtk/tr-core.c +++ b/gtk/tr-core.c @@ -606,18 +606,21 @@ scanWatchDir( TrCore * core ) if( isEnabled ) { - const char * basename; const char * dirname = pref_string_get( PREF_KEY_DIR_WATCH ); GDir * dir = g_dir_open( dirname, 0, NULL ); - while(( basename = g_dir_read_name( dir ))) + if( dir != NULL ) { - char * filename = g_build_filename( dirname, basename, NULL ); - maybeAddTorrent( core, filename ); - g_free( filename ); - } + const char * basename; + while(( basename = g_dir_read_name( dir ))) + { + char * filename = g_build_filename( dirname, basename, NULL ); + maybeAddTorrent( core, filename ); + g_free( filename ); + } - g_dir_close( dir ); + g_dir_close( dir ); + } } } -- 2.40.0