7 changed files
BExplorer/BetterExplorer | ||
Application | ||
ApplicationInstanceManager.cs | ||
HelperClasses | ||
SafeThread.cs | ||
PieChart | ||
BaseWPFHelpers.cs | ||
Tabs | ||
TabListEditorItem.xaml.cs | ||
MainWindow.xaml.cs | ||
PreviewMedia.cs | ||
Shell | ||
ShellViewEx.cs | ||
ApplicationInstanceManager.cs
/BExplorer/BetterExplorer/Application/ApplicationInstanceManager.cs-6+4/BExplorer/BetterExplorer/Application/ApplicationInstanceManager.cs
Add comment 58 UpdateRemoteObject(name);
Add comment 59
Add comment 60 // invoke (signal) wait handle on other process
Add comment 61 Minus if (eventWaitHandle != null) eventWaitHandle.Set();
Add comment 61 Plus eventWaitHandle?.Set();
Add comment 62
Add comment 63
Add comment 64 // kill current process
Add comment 81 // get shared object from other process
Add comment 82 var proxy =
Add comment 83 Activator.GetObject(typeof(InstanceProxy),
Add comment 84 Minus string.Format("ipc://{0}{1}{2}/{1}", Environment.MachineName, uri, Environment.UserName)) as InstanceProxy;
Add comment 84 Plus $"ipc://{Environment.MachineName}{uri}{Environment.UserName}/{uri}") as InstanceProxy;
Add comment 85
Add comment 86 // pass current command line args to proxy
Add comment 87 Minus if (proxy != null)
Add comment 88 Minus proxy.SetCommandLineArgs(InstanceProxy.IsFirstInstance, InstanceProxy.CommandLineArgs);
Add comment 87 Plus proxy?.SetCommandLineArgs(InstanceProxy.IsFirstInstance, InstanceProxy.CommandLineArgs);
Add comment 89 88
Add comment 90 89 // close current client channel
Add comment 91 90 ChannelServices.UnregisterChannel(clientChannel);
Add comment 102 101 ChannelServices.RegisterChannel(serverChannel, true);
Add comment 103 102
Add comment 104 103 // register shared type
Add comment 105 Minus RemotingConfiguration.RegisterWellKnownServiceType(
Add comment 106 Minus typeof(InstanceProxy), uri, WellKnownObjectMode.Singleton);
Add comment 104 Plus RemotingConfiguration.RegisterWellKnownServiceType(typeof(InstanceProxy), uri, WellKnownObjectMode.Singleton);
Add comment 107 105
Add comment 108 106 // close channel, on process exit
Add comment 109 107 Process process = Process.GetCurrentProcess();
SafeThread.cs
/BExplorer/BetterExplorer/HelperClasses/SafeThread.cs/BExplorer/BetterExplorer/HelperClasses/SafeThread.cs
BaseWPFHelpers.cs
/BExplorer/BetterExplorer/PieChart/BaseWPFHelpers.cs-11+4/BExplorer/BetterExplorer/PieChart/BaseWPFHelpers.cs
Add comment 414
Add comment 415 foreach (FrameworkElement me in lst)
Add comment 416 {
Add comment 417 Minus MediaElement meCast = me as MediaElement;
Add comment 417 Plus var meCast = me as MediaElement;
Add comment 418
Add comment 419 Minus if (meCast != null)
Add comment 419 Plus if (meCast != null && meCast.CanPause)
Add comment 420 {
Add comment 421 Minus if (meCast.CanPause)
Add comment 422 Minus {
Add comment 423 421 try
Add comment 424 422 {
Add comment 425 423 meCast.Pause();
Add comment 429 427 }
Add comment 430 428 }
Add comment 431 429 }
Add comment 432 Minus }
Add comment 433 430
Add comment 434 431 }
Add comment 435 432
Add comment 443 440
Add comment 444 441 foreach (FrameworkElement me in lst)
Add comment 445 442 {
Add comment 446 Minus MediaElement meCast = me as MediaElement;
Add comment 447 Minus
Add comment 448 Minus if (meCast != null)
Add comment 449 Minus {
Add comment 443 Plus var meCast = me as MediaElement;
Add comment 450 444 try
Add comment 451 445 {
Add comment 452 Minus meCast.Play();
Add comment 446 Plus meCast?.Play();
Add comment 453 447 }
Add comment 454 448 catch //(Exception e)
Add comment 455 449 {
Add comment 456 450 }
Add comment 457 451 }
Add comment 458 452 }
Add comment 459 Minus }
Add comment 460 453
Add comment 461 454
Add comment 462 455 /// <summary>
TabListEditorItem.xaml.cs
/BExplorer/BetterExplorer/Tabs/TabListEditorItem.xaml.cs/BExplorer/BetterExplorer/Tabs/TabListEditorItem.xaml.cs
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-4+2/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 1999 }
Add comment 2000 }
Add comment 2001
Add comment 2002 Minus
Add comment 2003 2002 private void miExtractHere_Click(object sender, RoutedEventArgs e) {
Add comment 2004 2003 string FileName = _ShellListView.GetFirstSelectedItem().ParsingName;
Add comment 2005 2004 var extractor = new SevenZipExtractor(FileName);
Add comment 2026 2025
Add comment 2027 2026 void extractor_ExtractionFinished(object sender, EventArgs e) {
Add comment 2028 2027 //throw new NotImplementedException();
Add comment 2029 Minus if ((sender as SevenZipExtractor) != null) (sender as SevenZipExtractor).Dispose();
Add comment 2028 Plus (sender as SevenZipExtractor)?.Dispose();
Add comment 2030 2029 }
Add comment 2031 2030
Add comment 2032 2031 void extractor_Extracting(object sender, ProgressEventArgs e) {
Add comment 3371 3370 var selectedTabItem = tcMain.SelectedItem as Wpf.Controls.TabItem;
Add comment 3372 3371 if (selectedTabItem != null) {
Add comment 3373 3372 selectedTabItem.Header = e.Folder.DisplayName;
Add comment 3374 Minus selectedTabItem.Icon = e.Folder.ThumbnailSource(16, ShellThumbnailFormatOption.IconOnly,
Add comment 3375 Minus ShellThumbnailRetrievalOption.Default);
Add comment 3373 Plus selectedTabItem.Icon = e.Folder.ThumbnailSource(16, ShellThumbnailFormatOption.IconOnly, ShellThumbnailRetrievalOption.Default);
Add comment 3376 3374 selectedTabItem.ShellObject = e.Folder;
Add comment 3377 3375 selectedTabItem.ToolTip = e.Folder.ParsingName.Replace("%20", " ").Replace("%3A", ":").Replace("%5C", @"\");
Add comment 3378 3376 }
PreviewMedia.cs
/BExplorer/BetterExplorer/PreviewMedia.cs-6+4/BExplorer/BetterExplorer/PreviewMedia.cs
Add comment 58 UpdateRemoteObject(name);
Add comment 59
Add comment 60 // invoke (signal) wait handle on other process
Add comment 61 Minus if (eventWaitHandle != null) eventWaitHandle.Set();
Add comment 61 Plus eventWaitHandle?.Set();
Add comment 62
Add comment 63
Add comment 64 // kill current process
Add comment 81 // get shared object from other process
Add comment 82 var proxy =
Add comment 83 Activator.GetObject(typeof(InstanceProxy),
Add comment 84 Minus string.Format("ipc://{0}{1}{2}/{1}", Environment.MachineName, uri, Environment.UserName)) as InstanceProxy;
Add comment 84 Plus $"ipc://{Environment.MachineName}{uri}{Environment.UserName}/{uri}") as InstanceProxy;
Add comment 85
Add comment 86 // pass current command line args to proxy
Add comment 87 Minus if (proxy != null)
Add comment 88 Minus proxy.SetCommandLineArgs(InstanceProxy.IsFirstInstance, InstanceProxy.CommandLineArgs);
Add comment 87 Plus proxy?.SetCommandLineArgs(InstanceProxy.IsFirstInstance, InstanceProxy.CommandLineArgs);
Add comment 89 88
Add comment 90 89 // close current client channel
Add comment 91 90 ChannelServices.UnregisterChannel(clientChannel);
Add comment 102 101 ChannelServices.RegisterChannel(serverChannel, true);
Add comment 103 102
Add comment 104 103 // register shared type
Add comment 105 Minus RemotingConfiguration.RegisterWellKnownServiceType(
Add comment 106 Minus typeof(InstanceProxy), uri, WellKnownObjectMode.Singleton);
Add comment 104 Plus RemotingConfiguration.RegisterWellKnownServiceType(typeof(InstanceProxy), uri, WellKnownObjectMode.Singleton);
Add comment 107 105
Add comment 108 106 // close channel, on process exit
Add comment 109 107 Process process = Process.GetCurrentProcess();