rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix starting with -c "".

Browse Source 
This is a regression introduced in 9b1729c77e.
This commit is contained in:
Florian Bruhin 2015-02-12 13:24:17 +01:00
parent 5a73f5d2c1
commit 0b55f4df77
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qutebrowser/config/config.py
View File

@ -140,11 +140,12 @@ def init(args):
sys.exit(1) sys.exit(1)
else: else:
objreg.register('config', config_obj) objreg.register('config', config_obj)
filename = os.path.join(confdir, 'qutebrowser.conf') if confdir is not None:
save_manager.add_saveable('config', config_obj.save, filename = os.path.join(confdir, 'qutebrowser.conf')
config_obj.changed, save_manager.add_saveable('config', config_obj.save,
config_opt=('general', 'auto-save-config'), config_obj.changed,
filename=filename) config_opt=('general', 'auto-save-config'),
filename=filename)
try: try:
key_config = keyconf.KeyConfigParser(confdir, 'keys.conf') key_config = keyconf.KeyConfigParser(confdir, 'keys.conf')
except (keyconf.KeyConfigError, UnicodeDecodeError) as e: except (keyconf.KeyConfigError, UnicodeDecodeError) as e:
@ -160,11 +161,12 @@ def init(args):
sys.exit(1) sys.exit(1)
else: else:
objreg.register('key-config', key_config) objreg.register('key-config', key_config)
filename = os.path.join(confdir, 'keys.conf') if confdir is not None:
save_manager.add_saveable('key-config', key_config.save, filename = os.path.join(confdir, 'keys.conf')
key_config.changed, save_manager.add_saveable('key-config', key_config.save,
config_opt=('general', 'auto-save-config'), key_config.changed,
filename=filename) config_opt=('general', 'auto-save-config'),
filename=filename)
datadir = standarddir.get(QStandardPaths.DataLocation, args) datadir = standarddir.get(QStandardPaths.DataLocation, args)
state_config = ini.ReadWriteConfigParser(datadir, 'state') state_config = ini.ReadWriteConfigParser(datadir, 'state')