diff options
| author | sr55 <[email protected]> | 2013-11-28 21:52:51 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-11-28 21:52:51 +0000 |
| commit | d33cfa2806a21154b76c45c74990d447f31b6f53 (patch) | |
| tree | e9abf1fc10f688e58b5e6e35c58b65fc5213d171 /win | |
| parent | 64a9291ee22789c54aa5da03b1882e4041961b7a (diff) | |
Interop: Fix an issue with the path being presented in the system codepath. Using UTF-8 now which should fix a number of issues with characters not displaying or passing-through correctly.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5907 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs | 6 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index c84d43cf2..af3a56ee4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -813,6 +813,12 @@ namespace HandBrake.Interop foreach (hb_title_s title in this.originalTitles)
{
var newTitle = this.ConvertTitle(title);
+
+ // Convert the Path to UTF-8.
+ byte[] bytes = Encoding.Default.GetBytes(title.path);
+ string utf8Str = Encoding.UTF8.GetString(bytes);
+ newTitle.Path = utf8Str;
+
this.titles.Add(newTitle);
}
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml index 12d75bf44..3ed9b0f11 100644 --- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml +++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml @@ -145,8 +145,8 @@ </Grid>
- <Label Content="Preview" FontWeight="Bold" Margin="15,0,0,0" Visibility="Collapsed" />
- <Button Content="Show Preview" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Collapsed" />
+ <Label Content="Preview" FontWeight="Bold" Margin="15,0,0,0" />
+ <Button Content="Show Preview" cal:Message.Attach="[Event Click] = [Action PreviewImage]" />
</StackPanel>
</StackPanel>
|