X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=c1bbba9aef86d7fccc936d2230f591ce3eb734d4;hp=bfa58e400e1cc5d62a3eb5d2a3264b26d562a964;hb=2bb9fcbfa99cf30a6f46ba33fd95c0a456a225cc;hpb=2a1a8d48bb089e4d1fbf26670c53a3524c422ff8 diff --git a/command.c b/command.c index bfa58e40..c1bbba9a 100644 --- a/command.c +++ b/command.c @@ -120,7 +120,7 @@ static char *get_status(struct misc_meta_data *nmmd) "%s: %s\n" /* afs mode */ "%s: %lu.%lu\n" /* stream start */ "%s: %lu.%lu\n" /* current server time */ - "%s\n", /* afs status info */ + "%s", /* afs status info */ status_item_list[SI_FILE_SIZE], nmmd->size / 1024, status_item_list[SI_MTIME], mtime, status_item_list[SI_STATUS], status, @@ -463,10 +463,11 @@ int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv) if (argc != 1) return -E_COMMAND_SYNTAX; mmd_lock(); - if (!vss_paused()) + if (!vss_paused() && !vss_stopped()) { mmd->events++; - mmd->new_vss_status_flags &= ~VSS_PLAYING; - mmd->new_vss_status_flags &= ~VSS_NEXT; + mmd->new_vss_status_flags &= ~VSS_PLAYING; + mmd->new_vss_status_flags &= ~VSS_NEXT; + } mmd_unlock(); return 1; }