tdehw: Fix wrong merge location in prior commit.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 8856d5dde1)
4 years ago · d51d6d349d
parent 53381ab391
commit d51d6d349d
1 changed files with 3 additions and 3 deletions
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@ -2974,9 +2974,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
 		TQDir valuesdir(valuesnodename);
 		valuesdir.setFilter(TQDir::All);
 		TQString nodename;
-		double bdevice_capacity = 0;
-		bool bdevice_has_energy = false;
-		bool bdevice_has_time_to_empty = false;
 		const TQFileInfoList *dirlist = valuesdir.entryInfoList();
 		if (dirlist) {
 			TQFileInfoListIterator valuesdirit(*dirlist);
@ -3032,6 +3029,9 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
 		TQDir valuesdir(valuesnodename);
 		valuesdir.setFilter(TQDir::All);
 		TQString nodename;
+		double bdevice_capacity = 0;
+		bool bdevice_has_energy = false;
+		bool bdevice_has_time_to_empty = false;
 		const TQFileInfoList *dirlist = valuesdir.entryInfoList();
 		if (dirlist) {
 			TQFileInfoListIterator valuesdirit(*dirlist);