Skip to content

Commit

Permalink
Revert "[processing] handle string settings from previous install (fo…
Browse files Browse the repository at this point in the history
…llowup 03eaad5)"

This reverts commit daf65d8.
  • Loading branch information
alexbruy committed Jan 13, 2017
1 parent daf65d8 commit 3605d4f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions python/plugins/processing/core/ProcessingConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ def getSetting(name):
v = None
except:
pass
return v
if ProcessingConfig.settings[name].valuetype == Setting.SELECTION:
return ProcessingConfig.settings[name].options.index(v)
else:
return v
else:
return None

Expand Down Expand Up @@ -325,10 +328,7 @@ def read(self, qsettings=QSettings()):
value = str(value).lower() == str(True).lower()

if self.valuetype == self.SELECTION:
try:
self.value = self.options[int(value)]
except:
self.value = self.options[0]
self.value = self.options[int(value)]
else:
self.value = value

Expand Down

1 comment on commit 3605d4f

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 3605d4f Jan 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexbruy, I actually had to revert the first part of this revert to get output's getDefaultFileExtension function working again, otherwise it was returning index numerical when functions are expecting the actual value (ie .tif, .shp, etc.)

Please sign in to comment.