krzosa/sublime_text_remedybg_plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix querying remedy executable

Browse Source
This commit is contained in:
Krzosa Karol
2023-01-25 08:15:33 +01:00
parent a0e25a9b2b
commit 1c2bf462ce
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
remedy.py
View File

@@ -21,7 +21,6 @@ class RemedyInstance:
self.process = None self.process = None
self.servername = "" self.servername = ""
self.breakpoints = {} self.breakpoints = {}
self.settings = sublime.load_settings("Remedy.sublime-settings")
def begin_command(self, cmd): def begin_command(self, cmd):
cmd_buffer = io.BytesIO() cmd_buffer = io.BytesIO()
@@ -237,7 +236,7 @@ class RemedyInstance:
print("RemedyBG: Server name = ", self.servername) print("RemedyBG: Server name = ", self.servername)
cmd = [get_remedy_executable(), "--servername", self.servername, target] cmd = [get_remedy_variable("executable", "remedybg.exe"), "--servername", self.servername, target]
print("Launching Remedy with command: " + str(cmd)) print("Launching Remedy with command: " + str(cmd))
self.process = subprocess.Popen(cmd) self.process = subprocess.Popen(cmd)
@@ -369,9 +368,10 @@ class RemedyInstance:
remedy_instance = RemedyInstance() remedy_instance = RemedyInstance()
def get_remedy_executable(): def get_remedy_variable(var, default):
window = sublime.active_window() settings = sublime.load_settings("Remedy.sublime-settings")
result = remedy_instance.settings.get("executable", "remedybg") result = settings.get(var)
if result == None: result = default
return result return result
def get_build_system(window): def get_build_system(window):
@@ -399,7 +399,7 @@ def get_build_system(window):
return project, build return project, build
def should_build_before_debugging(window): def should_build_before_debugging(window):
build_before = remedy_instance.settings.get("build_before_debugging", False) build_before = get_remedy_variable("build_before_debugging", False)
if build_before: if build_before:
project, build = get_build_system(window) project, build = get_build_system(window)
if project == None or build == None: if project == None or build == None:
@@ -577,7 +577,7 @@ class RemedyAllInOneCommand(sublime_plugin.TextCommand):
class RemedyOnBuildCommand(sublime_plugin.EventListener): class RemedyOnBuildCommand(sublime_plugin.EventListener):
def on_window_command(self, window, command_name, args): def on_window_command(self, window, command_name, args):
if command_name in ["build", "remedy_build"]: if command_name in ["build", "remedy_build"]:
if remedy_instance.settings.get("stop_debugging_on_build_command", False): if get_remedy_variable("stop_debugging_on_build_command", False):
remedy_instance.stop_debugging() remedy_instance.stop_debugging()
def plugin_unloaded(): def plugin_unloaded():