summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-01-02 12:30:30 +0000
committersr55 <[email protected]>2014-01-02 12:30:30 +0000
commitbef09e1019dcb45f69797c657ff39f74c08a3b89 (patch)
tree17521fbbee5a6b172754f5e069b09804f3c5fed7 /win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
parent15c345c23d8741a05c5124515adb3985e2b5ad5b (diff)
WinGui: Fix a crash when updating the status display.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5948 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 5b5b95324..ca3280a2c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1918,8 +1918,7 @@ namespace HandBrakeWPF.ViewModels
}
this.ProgramStatusLabel =
- string.Format(
- Resources.Main_EncodeStatusDisplay + josPending,
+ string.Format("{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}" + josPending,
e.PercentComplete,
e.CurrentFrameRate,
e.AverageFrameRate,