ubuntu-system-settings

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

  1. lp1358565_initial_lastFullCharge
  2. Merge into trunk
Proposed by Ken VanDine on 2015-01-28
Status: Merged
Approved by: Sebastien Bacher on 2015-01-29
Approved revision: 1280
Merged at revision: 1282
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1358565_initial_lastFullCharge
Merge into: lp:ubuntu-system-settings
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/lp1358565_initial_lastFullCharge
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) 2015-01-28 Approve on 2015-01-29
PS Jenkins bot continuous-integration Approve on 2015-01-29
Review via email: mp+247899@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.

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:03:03 +0000
3+++ plugins/battery/battery.h 2015-01-28 21:31:11 +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