From ed3c44de74b13be6a638c8d960e44e864e5ed7ee Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 13 Nov 2017 11:23:59 +0000 Subject: [PATCH] ide: improved startup time (not checking ide-aux file times if they are not local) git-svn-id: svn://ultimatepp.org/upp/trunk@11462 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/UppWspc.cpp | 13 ++++++++++++- uppsrc/ide/main.cpp | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp index 1a9c4ea9e..34568f718 100644 --- a/uppsrc/ide/UppWspc.cpp +++ b/uppsrc/ide/UppWspc.cpp @@ -201,6 +201,17 @@ void WorkspaceWork::SaveLoadPackage(bool sel) SyncWorkspace(); } +bool PathIsLocal(const String& path) +{ +#ifdef PLATFORM_WIN32 + char drive[4] = "?:\\"; + *drive = *path; + return GetDriveType(drive) == DRIVE_FIXED; +#else + return false; +#endif +} + void WorkspaceWork::LoadActualPackage() { Time utime = FileGetTime(ConfigFile("version")); @@ -220,7 +231,7 @@ void WorkspaceWork::LoadActualPackage() if(open) { Color uln = Null; String p = SourcePath(GetActivePackage(), f); - if(showtime) { + if(showtime && (findarg(actualpackage, "", "", "") < 0 || PathIsLocal(p))) { FindFile ff(p); if(ff) { Time ftm = Time(ff.GetLastWriteTime()); diff --git a/uppsrc/ide/main.cpp b/uppsrc/ide/main.cpp index 51364f40e..0f5820802 100644 --- a/uppsrc/ide/main.cpp +++ b/uppsrc/ide/main.cpp @@ -77,7 +77,7 @@ bool IsAssembly(const String& s) return false; } -void PreperEditorMode(const Vector& args, Ide& ide, bool& clset) +void StartEditorMode(const Vector& args, Ide& ide, bool& clset) { if(args.IsEmpty() || clset) { return; @@ -413,7 +413,7 @@ void AppMain___() DelTemps(); - PreperEditorMode(arg, ide, clset); + StartEditorMode(arg, ide, clset); if(splash_screen && !ide.IsEditorMode()) { ShowSplash();