From 6a7cb864d3eee3206f10fbe7f830d75c2b2e8c25 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Jun 30 2017 07:48:50 +0000 Subject: fix save custom layout file --- diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index c93ebc8..fc885c7 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -89,7 +89,8 @@ TEnv::IntVar NoShiftToggleAction("NoShiftToggleAction", 0); namespace { //============================================================================= -const std::string layoutsFileName = "layouts.txt"; +// layout file name may be overwritten by the argument +std::string layoutsFileName = "layouts.txt"; const std::string currentRoomFileName = "currentRoom.txt"; bool scrambledRooms = false; @@ -108,8 +109,10 @@ bool readRoomList(std::vector &roomPaths, " not found!"); fp = ToonzFolder::getRoomsFile(layoutsFileName); if (!TFileStatus(fp).doesExist()) return false; - } else + } else { argumentLayoutFileLoaded = true; + layoutsFileName = argumentLayoutFileName.toStdString(); + } } else { fp = ToonzFolder::getRoomsFile(layoutsFileName); if (!TFileStatus(fp).doesExist()) return false;