itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #270 from mattrose/issue262 

pass original working directory to dbus_options as well
This commit is contained in:
Matt Rose 2020-10-30 15:45:05 -04:00 committed by GitHub
parent e9ee7d4409 1d8a7f2b2f
commit 2af4e65b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terminator
View File

@ -68,7 +68,6 @@ if __name__ == '__main__':
dbg ("%s starting up, version %s" % (APP_NAME, APP_VERSION)) dbg ("%s starting up, version %s" % (APP_NAME, APP_VERSION))
OPTIONS,dbus_options = terminatorlib.optionparse.parse_options() OPTIONS,dbus_options = terminatorlib.optionparse.parse_options()
if OPTIONS.configjson: if OPTIONS.configjson:
configjson = ConfigJson() configjson = ConfigJson()
layoutname = configjson.extend_config(OPTIONS.configjson) layoutname = configjson.extend_config(OPTIONS.configjson)
@ -104,6 +103,7 @@ if __name__ == '__main__':
# (the -x argument for example) # (the -x argument for example)
if OPTIONS.working_directory is None: if OPTIONS.working_directory is None:
OPTIONS.working_directory = ORIGCWD OPTIONS.working_directory = ORIGCWD
dbus_options['working_directory'] = ORIGCWD
optionslist = dbus.Dictionary(dbus_options, signature='ss') optionslist = dbus.Dictionary(dbus_options, signature='ss')
if OPTIONS.new_tab: if OPTIONS.new_tab:
dbg('Requesting a new tab') dbg('Requesting a new tab')