Poprawiono zmianę czasu kolejnego backupu tylko na czas z przyszłości

IT-Students-Web-Project · Feb 3, 2021 · d7443ff · d7443ff
1 parent 192c538
commit d7443ff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/AutoBackup/AutoBackup.cpp b/AutoBackup/AutoBackup.cpp
@@ -15,6 +15,6 @@ int main()
     {
         vector<BackupProperties> tasks = taskLoader.loadTasks();
         taskExecutor.execute(tasks);
-        Sleep(30000);
+        Sleep(5000);
     }
 }
diff --git a/AutoBackup/AutoBackup.vcxproj b/AutoBackup/AutoBackup.vcxproj
@@ -86,7 +86,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -100,7 +100,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>

diff --git a/AutoBackup/TaskLoader.cpp b/AutoBackup/TaskLoader.cpp
@@ -33,7 +33,10 @@ std::vector<BackupProperties> TaskLoader::loadTasks()
 			if (isAwaiting(backup))
 			{
 				_tasks.push_back(backup);
-				backup = prepareForNextTime(backup);
+				do {
+					backup = prepareForNextTime(backup);
+				} while (isAwaiting(backup));
+
 				line = backupprops::to_string(backup);
 			}
 			temp << line << endl;

diff --git a/AutoBackupConsole/AutoBackupConsole.vcxproj b/AutoBackupConsole/AutoBackupConsole.vcxproj
@@ -86,7 +86,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -100,7 +100,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>