+ 5.0.4 (submit)

lairdubois · Sep 14, 2023 · 1efadb8 · 1efadb8
1 parent 4555522
commit 1efadb8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ CHANGELOG
 This changelog references the relevant changes (bug and security fixes) done
 in 5.x, 4.x, 3.x, 2.x, 1.x and 0.x versions.
 
+* 5.0.4 (2023-09-14)
+
+  * Fixed "Export to Layout" hang
+
 * 5.0.3 (2023-09-13)
 
   * Fixed the dimension parser that misinterpret decimal separator

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lairdubois-opencutlist-sketchup-extension",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "OpenCutList by L'Air du Bois =======================================",
   "main": "index.js",
   "directories": {

diff --git a/dist/ladb_opencutlist.rbz b/dist/ladb_opencutlist.rbz
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "5.0.3",
-  "build": "202309061530",
+  "version": "5.0.4",
+  "build": "202309140526",
   "url": "https://www.lairdubois.fr/opencutlist/download",
   "sponsor": {
     "objectiveName": "6.0",

diff --git a/src/ladb_opencutlist.rb b/src/ladb_opencutlist.rb
@@ -13,7 +13,7 @@ module OpenCutList
 
       # Create extension
       ex = SketchupExtension.new('OpenCutList', 'ladb_opencutlist/ruby/main')
-      ex.version     = "5.0.3"  ## /!\ Auto-generated line, do not edit ##
+      ex.version     = "5.0.4"  ## /!\ Auto-generated line, do not edit ##
       ex.copyright   = "2016-#{Date.today.year} - GNU GPLv3"  ## /!\ Auto-generated line, do not edit ##
       ex.creator     = 'L\'Air du Bois - www.lairdubois.fr'
 

diff --git a/src/ladb_opencutlist/js/constants.js b/src/ladb_opencutlist/js/constants.js
@@ -1,7 +1,7 @@
 // CONSTANTS
 // ======================
 
-var EXTENSION_BUILD = '202309061530';   // /!\ Auto-generated line, do not edit //
+var EXTENSION_BUILD = '202309140526';   // /!\ Auto-generated line, do not edit //
 
 // UI /////
 

diff --git a/src/ladb_opencutlist/ruby/constants.rb b/src/ladb_opencutlist/ruby/constants.rb
@@ -1,7 +1,7 @@
 module Ladb::OpenCutList
 
     EXTENSION_NAME = 'OpenCutList'.freeze
-    EXTENSION_VERSION = '5.0.3'.freeze
-    EXTENSION_BUILD = '202309061530'.freeze
+    EXTENSION_VERSION = '5.0.4'.freeze
+    EXTENSION_BUILD = '202309140526'.freeze
 
 end
diff --git a/src/ladb_opencutlist/ruby/worker/cutlist/cutlist_layout_to_layout_worker.rb b/src/ladb_opencutlist/ruby/worker/cutlist/cutlist_layout_to_layout_worker.rb
@@ -46,7 +46,7 @@ def run
       target_group = @cutlist.get_group(@target_group_id)
 
       # Base document name
-      doc_name = "#{@cutlist.model_name.empty? ? File.basename(@cutlist.filename, '.skp') : @cutlist.model_name}#{@cutlist.page_name.empty? ? '' : " - #{@cutlist.page_name}"}#{@cutlist.model_active_path.empty? ? '' : " - #{@cutlist.model_active_path.join('/')}"}#{target_group && target_group.material_type != MaterialAttributes::TYPE_UNKNOWN ? " - #{target_group.material_name} #{target_group.std_dimension}" : ''}"
+      doc_name = "#{@cutlist.model_name.empty? ? File.basename(@cutlist.filename, '.skp') : @cutlist.model_name}#{@cutlist.page_name.empty? ? '' : " - #{@cutlist.page_name}"}#{@cutlist.model_active_path.nil? || @cutlist.model_active_path.empty? ? '' : " - #{@cutlist.model_active_path.join('/')}"}#{target_group && target_group.material_type != MaterialAttributes::TYPE_UNKNOWN ? " - #{target_group.material_name} #{target_group.std_dimension}" : ''}"
 
       # Ask for layout file path
       layout_path = UI.savepanel(Plugin.instance.get_i18n_string('tab.cutlist.export.title'), @cutlist.dir, _sanitize_filename("#{doc_name}.layout"))