From: <am...@us...> - 2019-05-16 14:34:16
|
Revision: 10718 http://sourceforge.net/p/omegat/svn/10718 Author: amake Date: 2019-05-16 14:34:14 +0000 (Thu, 16 May 2019) Log Message: ----------- Fix order of loading and rebasing on project load Modified Paths: -------------- trunk/src/org/omegat/core/data/RealProject.java Modified: trunk/src/org/omegat/core/data/RealProject.java =================================================================== --- trunk/src/org/omegat/core/data/RealProject.java 2019-05-16 14:34:05 UTC (rev 10717) +++ trunk/src/org/omegat/core/data/RealProject.java 2019-05-16 14:34:14 UTC (rev 10718) @@ -358,15 +358,16 @@ } } + loadFilterSettings(); + loadSegmentationSettings(); + loadTranslations(); + loadSourceFiles(); + + // This MUST happen after calling loadTranslations() if (remoteRepositoryProvider != null && isOnlineMode) { Core.getMainWindow().showStatusMessageRB("TEAM_REBASE_AND_COMMIT"); rebaseAndCommitProject(true); } - - loadFilterSettings(); - loadSegmentationSettings(); - loadTranslations(); - loadSourceFiles(); allProjectEntries = Collections.unmodifiableList(allProjectEntries); importHandler = new ImportFromAutoTMX(this, allProjectEntries); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |