Merge drag+drop rewrite. It's now possible to drag multiple rows in

[disorder] / server / server-queue.c

diff --git a/server/server-queue.c b/server/server-queue.c
index 2efd94a361b46b00c1766db41a7215d63550e3ae..ab154748900cde84fd247b66e305cadb01180790 100644 (file)
--- a/server/server-queue.c
+++ b/server/server-queue.c
@@ -50,11 +50,11 @@ void queue_fix_sofar(struct queue_entry *q) {
       if(q->uptopause == -1)           /* Don't know how far thru. */
        sofar = -1;
       else if(q->lastresumed)          /* Has been paused and resumed. */
       if(q->uptopause == -1)           /* Don't know how far thru. */
        sofar = -1;
       else if(q->lastresumed)          /* Has been paused and resumed. */

-       sofar = q->uptopause + time(0) - q->lastresumed;
+       sofar = q->uptopause + xtime(0) - q->lastresumed;

       else                             /* Currently paused. */
        sofar = q->uptopause;
     } else                             /* Never been paused. */
       else                             /* Currently paused. */
        sofar = q->uptopause;
     } else                             /* Never been paused. */

-      sofar = time(0) - q->played;
+      sofar = xtime(0) - q->played;

     q->sofar = sofar;
   }
 }
     q->sofar = sofar;
   }
 }