← Back to branch summary

~cairo-dock-team/ubuntu/natty/cairo-dock-plug-ins/2.3.0-2.1

« back to all changes in this revision

Viewing changes to System-Monitor/src/applet-cpusage.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-08-10 00:05:57 UTC
  • mto: This revision was merged to the branch mainline in revision 10.
  • Revision ID: james.westby@ubuntu.com-20100810000557-htcyq9gwo5f7r6ec
Tags: upstream-2.2.0~0beta4
Import upstream version 2.2.0~0beta4

Show diffs side-by-side

added added

removed removed

Lines of Context:
System-Monitor/src/applet-cpusage.c
166
166
                return ;
167
167
        }
168
168
        
169
 
        g_timer_stop (myData.pClock);
170
169
        double fTimeElapsed = g_timer_elapsed (myData.pClock, NULL);
171
170
        g_timer_start (myData.pClock);
172
 
        g_return_if_fail (fTimeElapsed > 0.1);  // en conf, c'est 1s minimum.
 
171
        g_return_if_fail (fTimeElapsed > 0.1 || !myData.bInitialized);  // en conf, c'est 1s minimum.
173
172
        
174
173
        long long int new_cpu_user = 0, new_cpu_user_nice = 0, new_cpu_system = 0, new_cpu_idle = 0;
175
174
        tmp += 3;  // on saute 'cpu'.