no message

Author: alexeyneu

tool3/mainthread.cpp

@@ -119,9 +119,22 @@ VOID c(VOID *)
 									t7->SetPos(140.0*z.f); //after some runs with zero-divided args(or smth else like this) it refuses to deal any further												
 								}
 								z.endgame = bren == q_torque ? min(z.endgame, (int)ceil(z.outofthis * 10)) : 0;
-								if (z.endgame > 2) p.Format(L"days to go %2.1f", z.outofthis);
-								if (z.endgame == 2) p.Format(L"days to go %2.1f / %2d", z.outofthis, (int)ceil(24 * z.outofthis));
-								if (z.endgame == 1) p.Format(L"days to go %2.1f / %2d / %03d", z.outofthis, (int)ceil(24 * z.outofthis), (int)ceil(1440 * z.outofthis));
+								switch (z.endgame)
+								{
+								case 0:
+									p =		 L" right now     :        ";
+									p = p + braze[bren].c_str();
+									break;		
+								case 1:
+									p.Format(L"days to go %2.1f / %2d / %03d", z.outofthis, (int)ceil(24 * z.outofthis), (int)ceil(1440 * z.outofthis)); 
+									break;		
+								case 2:
+									p.Format(L"days to go %2.1f / %2d", z.outofthis, (int)ceil(24 * z.outofthis));
+									break;		
+								default:			
+									p.Format(L"days to go %2.1f", z.outofthis);
+									break;		
+								}
 								b7->SetWindowTextW((LPCWSTR)p);
 							}
 
@@ -141,7 +154,7 @@ VOID c(VOID *)
 						else
 						{
 							X7.Format(" %.2f block/m", z2.q*60.0f);
-							z.outofthis = (z2.block[0] - z2.block[2] + (z.block[0] - z.block[2] > 40000) * 22 * 40000) / (z2.q * 1440 * 60);
+							z.outofthis = (z2.block[0] - z2.block[2] + (z2.block[0] - z2.block[2] > 40000) * 22 * 40000) / (z2.q * 1440 * 60);
 							if (!(_statusfp()&(_EM_INVALID | _EM_ZERODIVIDE))) X8.Format("\\qr\\ri800\\fs30 days to go %.1f \\par\\ri0\\fs33\n", z.outofthis);
 							dc->SetState(PBST_PAUSED);
 							bhr->SetProgressState(hz, TBPF_PAUSED);