Author: echatellier Date: 2012-03-09 15:46:31 +0100 (Fri, 09 Mar 2012) New Revision: 2813 Url: http://chorem.org/repositories/revision/jtimer/2813 Log: #483 : Delete running task still tacking time Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-07 17:24:20 UTC (rev 2812) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-09 14:46:31 UTC (rev 2813) @@ -680,6 +680,7 @@ * Stop a task. * * Delegate method. Called by idle detect ? + * Called by delete method too. * * @param task task to stop */ @@ -687,13 +688,14 @@ RunTaskJob rtt = getJobForRunningTask(task); // test if task is already running - // should never be call if null !!! - rtt.wantToStop(); - core.getData().stopTask(task); - - // re-enable/disable buttons - setSelectedSingleRunningTask(false); - setSelectedSingleStoppedTask(true); + if (rtt != null) { + rtt.wantToStop(); + core.getData().stopTask(task); + + // re-enable/disable buttons + setSelectedSingleRunningTask(false); + setSelectedSingleStoppedTask(true); + } } /** @@ -774,6 +776,7 @@ if (confirm == JOptionPane.YES_OPTION) { // approved try { + stopTask(task); core.getData().deleteTask(task); } catch (DataViolationException e) { displayErrorMessage(e.getExceptionKey());