Commit Graph

1911 Commits

Author SHA1 Message Date
Rémi Verschelde 0edca99361
Merge pull request #15377 from mrcdk/wav_correct_loop
Fixed loop mode values when importing a wav file.
2018-01-08 14:52:19 +01:00
Rémi Verschelde 8f4140c9c1
Merge pull request #15480 from StateOff/fixes_deleted_nodes_in_history
Fixes #15416 - "The deleted nodes are hanging in the inspector."
2018-01-08 14:28:25 +01:00
Rémi Verschelde 11cc703810
Merge pull request #15483 from Noshyaar/pbm
Fix imported BitMap dimension flip
2018-01-08 11:05:00 +01:00
Rémi Verschelde 8f814e44bc
Merge pull request #15458 from volzhs/fix-editor-settings-1
Fix editor setting value is back to default
2018-01-08 10:55:09 +01:00
Poommetee Ketson 3c6dfbfea5 Fix imported BitMap dimension flip 2018-01-08 16:43:47 +07:00
Blazej Floch 9d3eb3d2b0 Fixes #15416 - "The deleted nodes are hanging in the inspector." 2018-01-08 03:12:41 -05:00
Rémi Verschelde a385460a6e
Merge pull request #15457 from volzhs/custom-font-source-code
Set source code font with ttf, otf
2018-01-08 08:07:13 +01:00
volzhs 797147bd4b Set source code font with ttf, otf
renamed interface/editor/custom_font to interface/editor/main_font
moved text_editor/theme/font to interface/editor/code_font
renamed interface/editor/font_size to interface/editor/main_font_size
renamed interface/editor/source_code_size to interface/editor/code_font_size
2018-01-08 05:12:39 +09:00
volzhs 93a6be0320 Fix editor setting value is back to default
Fix #15449
2018-01-08 04:56:40 +09:00
George Marques 37ca542d2b
Merge pull request #15433 from poke1024/fix13957
Fix crash due to stale refs to node selection lists
2018-01-07 14:56:43 -02:00
Rémi Verschelde abcb87bc43
Merge pull request #15357 from damarindra/autotile-behaviour
Fixing unconsistent behaviour on autotile editor
2018-01-07 16:00:00 +01:00
Rémi Verschelde 25e942d64f
Merge pull request #15438 from endragor/export-after-import
Perform export after import is fully complete
2018-01-07 14:27:03 +01:00
Rémi Verschelde a2fe9faa64
Merge pull request #15439 from poke1024/fix-debug-break
Fixes debugger randomly not pausing
2018-01-07 14:26:52 +01:00
Bernhard Liebl 09dd70878e Fixes debugger randomly not pausing 2018-01-07 13:00:15 +01:00
Rémi Verschelde 58d3756ec0
Merge pull request #15396 from volzhs/fix-editor-settings
Fix editor settings weird behavior
2018-01-07 12:40:40 +01:00
Bernhard Liebl 6c6a0fe840 Fix crash due to stale refs to node selection lists 2018-01-07 09:57:28 +01:00
Juan Linietsky 50b975548d Removed PBM bitmap loader, added abiliy to importi mages as bitmap. Fixes #14828 2018-01-06 16:38:36 -03:00
Poommetee Ketson 768fd83e61 Fix typo in new strings 2018-01-06 21:33:11 +07:00
Rémi Verschelde 2a1ce0fbc4 i18n: Sync translation templates with current source 2018-01-06 14:32:21 +01:00
Rémi Verschelde 15a1fe1b76 i18n: Sync translations with Weblate 2018-01-06 14:29:37 +01:00
volzhs 6ad43757ad Fix editor settings weird behavior 2018-01-06 20:54:00 +09:00
Juan Linietsky 061db1ca95 Avoid crashing when dependencies on inherited/instanced scenes cant be satisfied, fixes #15298 2018-01-05 19:02:54 -03:00
MrCdK 864b064def Fixed loop mode values when importing a wav file.
Importing a wav file that was exported with a custom loop type was causing it being imported with loop mode ping-pong
2018-01-05 22:29:37 +01:00
Juan Linietsky bb2341e813 Make sure .import folder exists before importing, in case user deleted it manually. Fixes #15315 2018-01-05 17:30:29 -03:00
Juan Linietsky 380ee87e80 Fixed problem with missing uninitialized last byte on waveform trip, closes #15316 2018-01-05 16:28:08 -03:00
Juan Linietsky a8a3d5c835 Fixes to GLTF2 importer skeleton positioning, though vertex bone indices still look broken somehow.. 2018-01-05 09:53:40 -03:00
damarindra 97b8be7261 Fixing weird behaviour on autotile editor 2018-01-05 17:53:30 +07:00
damarindra 0ae4ca7066 prevent autotile properties out of bounds 2018-01-05 15:28:36 +07:00
Rémi Verschelde 5322ed05c7
Merge pull request #15352 from thomaslynge/anim_drag_key_glitch
Visual glitch when dragging keyframes #15285
2018-01-05 08:00:25 +01:00
Thomas Lynge 509ac1e0b8 Visual glitch when dragging keyframes #15285. Changed to int cast. 2018-01-05 06:24:17 +01:00
Rémi Verschelde 34c988cfa9 Drop obsolete bitmap doc fonts 2018-01-05 01:23:55 +01:00
Rémi Verschelde e4213e66b2 Add missing copyright headers and fix formatting
Using `misc/scripts/fix_headers.py` on all Godot files.
Some missing header guards were added, and the header inclusion order
was fixed in the Bullet module.
2018-01-05 01:22:23 +01:00
Thomas Lynge 251a017447 Visual glitch when dragging keyframes #15285 2018-01-05 00:11:54 +01:00
Tim Schellenberg 2f7ab58780
forward_canvas_gui_input only takes one parameter 2018-01-04 22:07:32 +01:00
Rémi Verschelde 1b79326c0f
Merge pull request #15341 from volzhs/scene-index-error
Fix get_edited_scene_root error at starting editor
2018-01-04 20:42:47 +01:00
Artem Varaksa 928ca10a7b Clean up \n from end of translation strings 2018-01-04 22:00:39 +03:00
volzhs 1876999b3a Fix get_edited_scene_root error at starting editor
Fix #15300
2018-01-05 03:55:43 +09:00
Juan Linietsky 6e2ed15ff1 Add support from properly exporting shared objects, needed for GDNative export 2018-01-04 15:43:06 -03:00
Rémi Verschelde d9e254b318
Merge pull request #15323 from poke1024/fix-pm-scroll-glitch
Project Manager: fix random breaking of scrolling
2018-01-04 15:47:24 +01:00
Bernhard Liebl 25c5848e7e Project Manager: fix random breaking of scrolling 2018-01-04 15:24:20 +01:00
Rémi Verschelde 99eb394a5f
Merge pull request #14802 from volzhs/selection-changed
Fix "selection_changed" called twice
2018-01-04 15:02:47 +01:00
Rémi Verschelde 9e7fec3329
Merge pull request #14882 from willnationsdev/add-select-file
Plugins can select files in the FileSystem Dock
2018-01-04 14:59:34 +01:00
Rémi Verschelde b997773b26
Merge pull request #15033 from poke1024/shortcuts-mac
Alternative keyboard shortcuts for macOS
2018-01-04 14:56:29 +01:00
Rémi Verschelde dc2cc6bc2b
Merge pull request #15186 from GodotExplorer/default-theme
Fix errors with custom theme and custom font in project settings.
2018-01-04 14:50:15 +01:00
Rémi Verschelde da4edf83d3
Merge pull request #15311 from YeldhamDev/tileset_button_fix_2
Fixed "Tile Set" button always showing bug introduced with #15309
2018-01-04 13:54:16 +01:00
Michael Alexsander Silva Dias ca90c737b7 Fixed "Tile Set" button always showing bug introduced with #15309. 2018-01-04 09:26:24 -02:00
firefly2442 f066991aa7 found via cppcheck:
remove code that will never run
make definition and declaration names for parameters match
change floats that were being set to bool values
remove pointer that is never used
2018-01-03 21:23:48 -07:00
Rémi Verschelde 1235d422ea
Merge pull request #15309 from YeldhamDev/tileset_button_fix
Fixed the "Tile Set" button being able to go out of bounds
2018-01-04 01:36:24 +01:00
Rémi Verschelde 2870ffe443
Merge pull request #15301 from YeldhamDev/curve_menu_fix
Small fixes for the  Curve Editor's context menu
2018-01-04 01:24:37 +01:00
Rémi Verschelde d65ac7378c Fix crash in OS::execute on FreeBSD
As spotted by @robfram, closes #15288.
Also reviewed other uses of `if (String.find(.*))` for potential similar mistakes, found a wrong (and useless) one in ScriptEditorDialog.
2018-01-04 01:20:20 +01:00
Rémi Verschelde e68965672d
Merge pull request #15135 from YeldhamDev/change_node_dialog
Made the Create Dialog be clearer when it's changing a type of something
2018-01-04 01:08:47 +01:00
Michael Alexsander Silva Dias fb68ceebae Fixed the "Tile Set" button being able to go out of bounds. 2018-01-03 21:56:57 -02:00
Rémi Verschelde f9f6f250e6
Merge pull request #15191 from Jerome67000/z_renaming
renames "z" Node2D property to "z_index"
2018-01-04 00:41:45 +01:00
Michael Alexsander Silva Dias 335c1d1880 Small fixes for the Curve Editor's context menu. 2018-01-03 16:47:08 -02:00
Razah e3c9a7ed4f Fix broken Info.plist after copyright update
Fixes #15293.
+ related misc fixes by @akien-mga.
2018-01-03 17:10:07 +01:00
Michael Alexsander Silva Dias a6a2ea7a5e Made the Create Dialog be clearer when it's changing a type of something. 2018-01-03 13:33:25 -02:00
Bernhard Liebl bd5e3052ac Fix Godot getting swamped by debug events 2018-01-03 15:59:10 +01:00
Rémi Verschelde 2488aff93f
Merge pull request #15257 from sersoong/master-addshowscript
Add Show In File System to script editor tabs
2018-01-03 13:55:02 +01:00
Rémi Verschelde cdcf2e7e1c
Merge pull request #15126 from poke1024/code-editor-autowrap-error
Make code editor's error display autowrap
2018-01-03 13:47:43 +01:00
Jerome67000 42ae3525a3 #15078 renamed "z" -> "z_index" property in Node2D 2018-01-03 13:02:26 +01:00
Rémi Verschelde bc513dfa84
Merge pull request #15224 from volzhs/fix-duplicate-file
Fix duplicating file or folder
2018-01-03 12:52:19 +01:00
Bernhard Liebl a4fab0ab42 Make code editor's error display autowrap 2018-01-03 12:41:11 +01:00
Rémi Verschelde 8cf9269cdb
Merge pull request #15225 from volzhs/lock-group-invisible-node
Fix lock or group with invisible node
2018-01-03 12:35:12 +01:00
Rémi Verschelde 361ade53aa
Merge pull request #15185 from damarindra/master
Improve : ease of use TileSet Editor
2018-01-03 12:06:21 +01:00
Rémi Verschelde 5cbbf87e60
Merge pull request #15226 from volzhs/copy-resource
Copy resource with specific extension
2018-01-03 11:56:08 +01:00
Rémi Verschelde 459ee51338
Merge pull request #15093 from poke1024/canvas-editor-select
More exact picking for canvas editor
2018-01-03 11:15:28 +01:00
Rémi Verschelde 0b235a5efa
Merge pull request #15102 from YeldhamDev/project_manager_changes
Changes to the Project Manager's New Project/Export dialogs
2018-01-03 11:06:37 +01:00
Rémi Verschelde edd78d54c4
Merge pull request #15073 from volzhs/editor-custom-font
Use .ttf or .otf file for editor custom font
2018-01-03 10:44:19 +01:00
Rémi Verschelde 3f28b72f35
Merge pull request #15066 from poke1024/shortcut-clear-output
Add keyboard shortcut for Clear Output
2018-01-03 10:32:26 +01:00
Rémi Verschelde 6cd33f17f7
Merge pull request #14792 from Krakean/enh-1
A few small Debugger->Errors tab enhancements:
2018-01-03 10:26:55 +01:00
Rémi Verschelde 9821562b30
Merge pull request #15230 from RyanStein/bugfix-14989
Move Project Manager favorite icon back to center.
2018-01-02 11:34:30 +01:00
damarindra 9b04973568 Improve : ease of use TileSet Editor 2018-01-02 16:15:33 +07:00
sersoong 77c9698785 Add Show In File System to script editor tabs 2018-01-02 10:11:54 +08:00
Rémi Verschelde b50a9114b1 Update copyright statements to 2018
Happy new year to the wonderful Godot community!
2018-01-01 14:40:47 +01:00
Noshyaar 2b16905387
Merge pull request #14957 from YeldhamDev/right_dock_fix
Fixed right dock dragger not disappearing when there is no docks there.
2018-01-01 18:52:47 +07:00
Noshyaar a6328011d8
Merge pull request #14973 from poke1024/docs-word-selection
Double-click word selection for RichTextLabel (i.e. docs)
2018-01-01 18:51:35 +07:00
Noshyaar 2154f82302
Merge pull request #15152 from poke1024/editor-settings-change
Only send editor "settings_changed" if actually changed
2018-01-01 18:48:33 +07:00
Noshyaar 9186047767
Merge pull request #15111 from poke1024/fix15097
Fixes various Line2D and Polygon2D editor bugs
2018-01-01 18:46:33 +07:00
Noshyaar 6aae9affec
Merge pull request #15080 from volzhs/text-color
Respect text editor highlighting color changes
2018-01-01 18:46:05 +07:00
Noshyaar 0ac7c0b1af
Merge pull request #15101 from nounoursheureux/master
Make filesystem search case-insensitive
2018-01-01 18:42:37 +07:00
Ryan Stein 67c158fe9f Move Project Manager favorite icon back to center. 2017-12-31 19:58:17 -05:00
volzhs 0341070cde Fix duplicating file or folder
Fix #15206
2018-01-01 05:03:20 +09:00
volzhs 4d0097e8ae Copy resource with specific extension
Fix #15169
2018-01-01 02:35:46 +09:00
volzhs 108b4a37b0 Fix lock or group with invisible node
Fix #15205
2018-01-01 02:18:39 +09:00
firefly2442 9ba9e37220 prevent strings from being evaluated to just "true" 2017-12-30 21:22:16 -07:00
Bernhard Liebl 86154c4c69 Various fixes for 2d polygon editor
Fixes issues 15096, 15097
Fixes various other Line2D edit issues
Fixes previous outline
Fixes retina support
2017-12-30 17:51:53 +01:00
Ruslan Mustakov ab12a5cf8e Perform export after import is fully complete
Previously command line export would go simultaneously with reimport,
which caused final package to either miss something or contain
outdated assets or perhaps even broken ones.
2017-12-30 16:39:09 +07:00
geequlim bd0a9f4bd6 Fix errors with custom default theme and custom fonts. 2017-12-30 17:30:37 +08:00
Noshyaar 47810cbaea
Merge pull request #15117 from damarindra/master
Autotile Enhancement
2017-12-29 19:14:12 +07:00
Bernhard Liebl 62f3af9de1 Only send editor "settings_changed" if actually changed. 2017-12-29 11:03:29 +01:00
Juan Linietsky f11a138505 Added more hacks to GLTF2 importer to support crap exporter (MakeHuman in this case), fixes #13393 2017-12-28 16:07:45 -03:00
damarindra e850360948 Autotile Enhancement 2017-12-28 23:57:23 +07:00
Bernhard Liebl b80bc553dd Double-click word selection for RichTextLabel (i.e. docs) 2017-12-28 17:44:22 +01:00
volzhs 4b0f075e95 Respect text editor highlighting color changes
Fix #14838
2017-12-28 23:49:15 +09:00
Noshyaar 7f1265b41f
Merge pull request #15104 from djrm/pr_visual_improvements
Minor style fixes for editor help
2017-12-28 07:01:41 +07:00
Bernhard Liebl 8505871a87 More exact picking for canvas editor 2017-12-27 20:24:58 +01:00
Juan Linietsky 988d29bdd8 Reimport now checks source path changes and imported files and their md5, fixes #14728 2017-12-27 15:22:04 -03:00
Michael Alexsander Silva Dias 0930f4cbcb Changes to the Project Manager's New Project/Export dialogs. 2017-12-27 16:13:13 -02:00
Daniel J. Ramirez fec41618dc Minor style fixes for editor help 2017-12-27 10:35:26 -06:00
Wilhem Barbier 03beb9ac7d Make filesystem search case-insensitive 2017-12-27 15:49:19 +00:00
Noshyaar e6b6683694
Merge pull request #14991 from djrm/pr_fixes
Show Options Dialog for NodePath and File in clicked button position.
2017-12-27 10:29:25 +07:00
Noshyaar 4bf1d3afbf
Merge pull request #15028 from YeldhamDev/editor_file_dialog_changes
Changes to the Editor File Dialog
2017-12-27 10:27:06 +07:00
Noshyaar e2a091e600
Merge pull request #15032 from Noshyaar/pr
EditorAbout: TTR workaround for "Project Manager" contexts
2017-12-27 10:26:03 +07:00
Noshyaar d5f92c2baa
Merge pull request #15081 from volzhs/fix-status-font
Fix text editor status font
2017-12-27 10:17:53 +07:00
volzhs 056bc123f8 Fix text editor status font
mistake from https://github.com/godotengine/godot/commit/15986ea343#diff-e7b153431ed956907f3ee3ef07ac59dd
2017-12-27 06:09:28 +09:00
Juan Linietsky 57061413eb Properly rename scenes and resources after renaming or moving files, should fix #13976
It's not tested, so please test.
2017-12-26 16:32:12 -03:00
volzhs 2c8ebab93b Use .ttf or .otf file for editor custom font 2017-12-27 03:14:48 +09:00
Gilles Roudiere b8c849205c Fix 2D editor checkboxes with a new project 2017-12-26 16:39:58 +01:00
Bernhard Liebl 77b4256718 Add keyboard shortcut for Clear Output 2017-12-26 11:41:38 +01:00
Bernhard Liebl 3f122672a2 On macOS, change some default editor shortcuts 2017-12-26 11:24:12 +01:00
Poommetee Ketson 6c897707ca Add missing parameter names 2017-12-25 21:19:56 +07:00
volzhs cc1d56e3ff Fix popup menu size in Inspector dock 2017-12-25 19:31:53 +09:00
Poommetee Ketson bfd8047e13 EditorAbout: TTR workaround for "Project Manager" contexts 2017-12-25 15:02:54 +07:00
Michael Alexsander Silva Dias ecf3fbadf4 Changes to the Editor File Dialog. 2017-12-25 02:29:00 -02:00
Noshyaar 256a60bc6e
Merge pull request #14826 from carlosfvieira/14371-F_key_Viewport_focus_problem
Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys)
2017-12-25 08:42:31 +07:00
Noshyaar aecffd71d8
Merge pull request #14847 from YeldhamDev/3d_viewport_save
Fixes for the Spatial Editor's Perspective options and dead code cleaning
2017-12-25 08:40:43 +07:00
Noshyaar deda8974df
Merge pull request #14853 from MattUV/context-menu
Adds an option to move cursor with right click in TextEdit
2017-12-25 08:40:20 +07:00
Noshyaar 5859db00d8
Merge pull request #14846 from carlosfvieira/weird_gizmo_ortho
Fixes gizmo huge scale immediately after change to orthogonal view
2017-12-25 08:39:08 +07:00
Noshyaar c9c1bc7a73
Merge pull request #14732 from AndreaCatania/jgizmo
Fixed joint gizmos drawing orientations
2017-12-25 08:32:55 +07:00
Noshyaar b6c798a062
Merge pull request #14827 from RayKoopa/editor_patchwork
Some Editor UI patchwork
2017-12-25 08:28:53 +07:00
Noshyaar 3f193af893
Merge pull request #14808 from YeldhamDev/script_editor_fixes
Some fixes for the Script Editor and dead code cleaning.
2017-12-25 08:27:38 +07:00
Noshyaar 3e4836567b
Merge pull request #14908 from YeldhamDev/dialog_changes
Fixes and modifications for some dialogs
2017-12-25 08:23:06 +07:00
Daniel J. Ramirez e7b24c648c Added default close and title color to editor themed graph nodes 2017-12-24 13:08:53 -06:00
Daniel J. Ramirez 07fd5456c8 Show Options Dialog for NodePath and File in clicked button position.
Auto select newly created nodes.
2017-12-23 15:15:48 -06:00
geequlim 52ad2e5418 Add more translatable text for editor plugins. 2017-12-23 22:40:15 +08:00
AndreaCatania eb32c4b5d2 Fixed joint gizmos orientations 2017-12-23 15:19:03 +01:00
Poommetee Ketson 9fd7aec2b4 ProjectManager: enhance dialog ok button text 2017-12-23 09:06:03 +07:00
Michael Alexsander Silva Dias 68a6edfd1b Fixed right dock dragger not disappearing when there is no docks there. 2017-12-22 17:12:13 -02:00
Rémi Verschelde 3068ccc8e6
Merge pull request #14913 from poke1024/tooltip-shortcut-names
Consistent display of shortcut names in tooltips
2017-12-21 22:47:50 +01:00
poke1024 22d87f20fa Consistent display of shortcut names in tooltips 2017-12-21 20:17:30 +01:00
volzhs d9e5be1d66 Fix open directory in FileSystem dock 2017-12-22 04:16:04 +09:00
Michael Alexsander Silva Dias e86454fb38 Fixes and modifications for some dialogs. 2017-12-21 15:26:46 -02:00
Juan Linietsky 1fa9aac3e4 -Make capture dependent on a cell size, not subdivision.
-Fixed a bug recently introduced when releasing mouse events and calling popups
2017-12-21 11:05:55 -03:00
carlosfvieira 49859871d9 Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys) - this closes #14371 and closes #12409
Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys) - this closes #14371 and closes #12409
2017-12-21 11:29:17 +00:00
Will Nations 1408fab1b4 Plugins can select files in FileSystem Dock 2017-12-20 16:34:21 -06:00
Rémi Verschelde 0b1e6ec219
Merge pull request #14874 from volzhs/blurry-zoom
Fix blurry after zooming
2017-12-20 22:19:16 +01:00
Rémi Verschelde 03823f12c5 EditorSettings: Move scene tab options to their dedicated category
Fixes #14870.
2017-12-20 19:41:02 +01:00
Rémi Verschelde acf835cb08 i18n: Sync translation templates with current source 2017-12-20 17:10:28 +01:00
Rémi Verschelde a27b57829e i18n: Sync translations with Weblate
Adds Icelandic and Tamil.
2017-12-20 17:08:48 +01:00
volzhs ec139d8522 Fix blurry after zooming 2017-12-21 00:39:02 +09:00
MattUV a55870cd81 Adds an option to move cursor with right click in TextEdit
Fixes #14832
- Added an option in the editor settings/cursor to make the cursor move with right click.
- If the option is activated (true by default), a right click will move the cursor before displaying context menu.
 - If there is a selection, a right click on it will keep it selected, a right click outside it will unselect it.
 - The option is available in textEdit via an inspector property (or via GDScript): caret_moving_by_right_click
 - The option is available in the script editor and the shader editor via the editor settings
 - The documentation has been updated with the new property, and a few other entries in TextEdit.xml.
2017-12-20 09:01:09 +01:00
Michael Alexsander Silva Dias 2490c4d882 Fixes for the Spatial Editor's Perspective options and dead code cleaning. 2017-12-20 01:05:21 -02:00
Carlos Vieira 2a3f6ee8b3 #14619 - fixes issue 1 (gizmo huge scale) - also referred in #14836 2017-12-19 23:45:10 +00:00
Juan Linietsky bf47b15e2c Good while it lasted, restored full 3D for 2D viewport, as required for Canvas BG mode. Fixes #14540 2017-12-19 15:59:32 -03:00
Ray Koopa 69ef89a8bd Limit code editor minimum width, clear Scene node subresource menu before refilling it 2017-12-19 18:29:01 +01:00
Juan Linietsky a714e1a4c7 Fixed bug where all file dialogs requested thumbnails even if hidden. 2017-12-19 12:57:46 -03:00
Juan Linietsky 1eb1837d0c Should no longer crash after rebaking, may be a solution to #14795
Not sure if this is the same problem, as reported, please test.
2017-12-19 09:58:02 -03:00
Guilherme Felipe 8adf7c3ef2 Add method_descr again because it's required for classes that
don't have public methods. revert #14814
2017-12-18 22:47:17 -02:00
Guilherme Felipe 5c0271eed7 Fix doc methods not showing up 2017-12-18 20:35:15 -02:00
Rémi Verschelde d81bd965b6 Fix bug in previous commit 2017-12-18 20:59:32 +01:00