diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-26 19:36:19 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-26 19:36:19 +0200 |
| commit | 3070215d9fcd35972dbb9d77e7d641b26e11acc2 (patch) | |
| tree | 30c073911d0895de88720c8cf09814c41c7af136 /plugins/vfs_curl | |
| parent | d96cd3ec8c0a84f88a40d63f788c56e78d92c486 (diff) | |
fixed crashbug in vfs_curl
Diffstat (limited to 'plugins/vfs_curl')
| -rw-r--r-- | plugins/vfs_curl/vfs_curl.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c index 94149b6a..2ae6d617 100644 --- a/plugins/vfs_curl/vfs_curl.c +++ b/plugins/vfs_curl/vfs_curl.c @@ -25,8 +25,8 @@ #include <time.h> #include "../../deadbeef.h" -#define trace(...) { fprintf(stderr, __VA_ARGS__); } -//#define trace(fmt,...) +//#define trace(...) { fprintf(stderr, __VA_ARGS__); } +#define trace(fmt,...) #define min(x,y) ((x)<(y)?(x):(y)) #define max(x,y) ((x)>(y)?(x):(y)) @@ -806,10 +806,12 @@ void http_abort (DB_FILE *fp) { trace ("http_abort\n"); HTTP_FILE *f = (HTTP_FILE *)fp; - deadbeef->mutex_lock (f->mutex); - f->status = STATUS_ABORTED; - deadbeef->mutex_unlock (f->mutex); - deadbeef->thread_join (f->tid); + if (f->tid) { + deadbeef->mutex_lock (f->mutex); + f->status = STATUS_ABORTED; + deadbeef->mutex_unlock (f->mutex); + deadbeef->thread_join (f->tid); + } } static int |