AppliStation-GUI,UserPrefForm.csへのコメント追加

[applistation/AppliStation.git] / AppliStation / AppliStation.Util / ExecutionProgressViewer.cs

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
index 6ae5799..fa6e0ea 100644 (file)
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
@@ -95,7 +95,6 @@ namespace AppliStation.Util
                        } else {\r
                                progressBar.Style = ProgressBarStyle.Marquee;\r
                        }\r
-                       progressLabel.Text = e.TaskMessage ?? string.Empty;\r
                        \r
                        cancelButton.Enabled = taskSet.Running && taskSet.Cancelable;\r
                        \r
@@ -111,7 +110,7 @@ namespace AppliStation.Util
                                        }\r
                                        break;\r
                                case NaGetTaskSetEventType.STARTED_TASKSET:\r
-                                       subtitleLabel.Text = taskSet.TaskSetNames[taskSet.CurrentTaskSetIndex];\r
+                                       progressLabel.Text = taskSet.TaskSetNames[taskSet.CurrentTaskSetIndex];\r
                                        logBox.AppendText("  " + e.TaskMessage + System.Environment.NewLine);\r
                                        break;\r
                                case NaGetTaskSetEventType.COMPLETED_TASKSET:\r
@@ -143,6 +142,7 @@ namespace AppliStation.Util
                                        logBox.SelectionColor = logBox.ForeColor;\r
                                        \r
                                        NativeMethods.ProgressBar_SetState(progressBar, 1); // VistaProgress色：中断\r
+                                       NativeMethods.ProgressBar_SetState(progressBarSub, 1); // VistaProgress色：中断\r
                                        \r
                                        autoCloseCheckBox.Enabled = false;\r
                                        okButton.Enabled = true;\r
@@ -223,6 +223,8 @@ namespace AppliStation.Util
                public void StartTaskSet()\r
                {\r
                        tasksetRunningThread = new Thread(taskSet.Run);\r
+                       // スレッドをSTAにしないとCOMアクセスできず、ウイルススキャンができない。\r
+                       tasksetRunningThread.SetApartmentState(ApartmentState.STA);\r
                        tasksetRunningThread.Start();\r
                }\r
                \r