diff -ur kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java kmttg-0.7j/src/com/tivo/kmttg/main/config.java --- kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java 2010-03-29 14:30:14.000000000 -0400 +++ kmttg-0.7j/src/com/tivo/kmttg/main/config.java 2010-04-16 01:13:16.415035507 -0400 @@ -326,25 +326,23 @@ if ( ! file.isDir(tmpDir) ) { tmpDir = programDir; } - } + } + + // multi-user settings patch for SVN r1020 + String settingsDir = System.getProperty("user.home") + s + ".kmttg"; + (new File(settingsDir)).mkdir(); // Try and get MAK from ~/.tivodecode_mak String result = getMakFromFile(); if (result != null) MAK = result; // These files all should reside along side jar file - configIni = programDir + s + "config.ini"; - autoIni = programDir + s + "auto.ini"; - autoLog = programDir + s + "auto.log"; - autoHistory = programDir + s + "auto.history"; - encProfDir = programDir + s + "encode"; - - // File to store/restore GUI settings - gui_settings = programDir + s + ".kmttg_settings"; - if (file.isDir(System.getProperty("user.home"))) { - // Centralize this non-critical file instead of localizing it - gui_settings = System.getProperty("user.home") + s + ".kmttg_settings"; - } + configIni = settingsDir + s + "config.ini"; + autoIni = settingsDir + s + "auto.ini"; + autoLog = settingsDir + s + "auto.log"; + autoHistory = settingsDir + s + "auto.history"; + encProfDir = "/usr/share/kmttg/encode"; // gentoo ebuild hack!! + gui_settings = settingsDir + s + "kmttg_settings"; // Non-executable defaults tivoFileNameFormat = "[title] ([monthNum]_[mday]_[year])";