Arranged: ModelToName()

dvdvideo1234 · Jun 26, 2016 · 63b5999 · 63b5999
1 parent fac37bd
commit 63b5999
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lua/autorun/trackassembly_init.lua b/lua/autorun/trackassembly_init.lua
@@ -30,7 +30,7 @@ local asmlib = trackasmlib
 
 ------ CONFIGURE ASMLIB ------
 asmlib.InitAssembly("track","assembly")
-asmlib.SetOpVar("TOOL_VERSION","5.259")
+asmlib.SetOpVar("TOOL_VERSION","5.260")
 asmlib.SetIndexes("V",1,2,3)
 asmlib.SetIndexes("A",1,2,3)
 asmlib.SetIndexes("S",4,5,6,7)

diff --git a/lua/trackassembly/trackasmlib.lua b/lua/trackassembly/trackasmlib.lua
@@ -1109,11 +1109,10 @@ function ModelToName(sModel,bNoSettings)
     return StatusLog("","ModelToName: Argument {"..type(sModel).."}<"..tostring(sModel)..">") end
   if(IsEmptyString(sModel)) then return StatusLog("","ModelToName: Empty string") end
   local fCh, bCh, Cnt = "", "", 1
-  local sSymDiv = GetOpVar("OPSYM_DIVIDER")
-  local sSymDir = GetOpVar("OPSYM_DIRECTORY")
-  local sModel  = (stringSub(sModel,1,1) ~= sSymDir) and (sSymDir..sModel)
-        sModel  =  stringGsub(stringToFileName(sModel),GetOpVar("FILE_MODEL"),"")
-  local gModel  = stringSub(sModel,1,-1) -- Create a copy so we can select cut-off parts later on
+  local sSymDiv, sSymDir = GetOpVar("OPSYM_DIVIDER"), GetOpVar("OPSYM_DIRECTORY")
+  local sModel = (stringSub(sModel,1, 1) ~= sSymDir) and (sSymDir..sModel) or sModel
+        sModel =  stringGsub(stringToFileName(sModel),GetOpVar("FILE_MODEL"),"")
+  local gModel =  stringSub(sModel,1,-1) -- Create a copy so we can select cut-off parts later on
   if(not bNoSettings) then
     local tCut, tSub, tApp = SettingsModelToName("GET")
     if(tCut and tCut[1]) then