diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-21 11:52:58 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-21 11:52:58 -0700 |
| commit | 49d36df28d26abcd80b31f5e470fb57b33e77c14 (patch) | |
| tree | 6c2a0392d11f2327138d4d1a462fac44cf2b26dd /grc | |
| parent | 261dcbe6604a3074429002ea5da8ca67d6fa95db (diff) | |
| parent | d4bb541ec1ec93446ecfa53948a1a6f995fffb64 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/gui/Constants.py | 2 | ||||
| -rw-r--r-- | grc/gui/Dialogs.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/grc/gui/Constants.py b/grc/gui/Constants.py index 022564cd77..6a7b54dffa 100644 --- a/grc/gui/Constants.py +++ b/grc/gui/Constants.py @@ -23,7 +23,7 @@ from ..core.Constants import * # default path for the open/save dialogs -DEFAULT_FILE_PATH = os.getcwd() +DEFAULT_FILE_PATH = os.getcwd() if os.name != 'nt' else os.path.expanduser("~/Documents") # file extensions IMAGE_FILE_EXTENSION = '.png' diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 1d114356c8..83ad9651b2 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -72,7 +72,7 @@ class TextDisplay(SimpleTextDisplay): # for each \b delete one char from the buffer back_count = 0 start_iter = self.get_buffer().get_end_iter() - while line[back_count] == '\b': + while len(line) > back_count and line[back_count] == '\b': # stop at the beginning of a line if not start_iter.starts_line(): start_iter.backward_char() back_count += 1 |