Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge into lp:ubuntu-system-settings/rtm-14.09

Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 975
Merged at revision: 977
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge
Merge into: lp:ubuntu-system-settings/rtm-14.09
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/battery/battery.h (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+248006@code.launchpad.net

Commit message

initialize m_lastFullCharge as NULL

Description of the change

initialize m_lastFullCharge as NULL, preventing a random delta from being computed.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/battery/battery.h'
2--- plugins/battery/battery.h 2014-11-12 19:05:29 +0000
3+++ plugins/battery/battery.h 2015-01-29 16:11:33 +0000
4@@ -59,7 +59,7 @@
5 bool m_powerdRunning;
6 UpDevice *m_device;
7 QString m_deviceString;
8- int m_lastFullCharge;
9+ int m_lastFullCharge = NULL;
10 void buildDeviceString();
11 void getLastFullCharge();
12 bool updateLastFullCharge(UpHistoryItem *item, int offset);

Subscribers

People subscribed via source and target branches