Skip to content

Commit 368eb7f

Browse files
committed
Bump version for release.
1 parent b36410c commit 368eb7f

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/Dialogs/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private void Window_PreviewDragEnter(object sender, DragEventArgs e)
212212
{
213213
try
214214
{
215-
e.Effects = (IsWindowEnabled(new HandleRef(this, Hwnd)) && e.Data.GetDataPresent(DataFormats.FileDrop)) ? DragDropEffects.Copy : DragDropEffects.None;
215+
e.Effects = (IsWindowEnabled(new HandleRef(this, Hwnd)) && (!m_isPopupDialogShowing) && e.Data.GetDataPresent(DataFormats.FileDrop)) ? DragDropEffects.Copy : DragDropEffects.None;
216216
}
217217
catch
218218
{
@@ -230,7 +230,7 @@ private void Window_PreviewDrop(object sender, DragEventArgs e)
230230
{
231231
try
232232
{
233-
if (IsWindowEnabled(new HandleRef(this, Hwnd)))
233+
if (IsWindowEnabled(new HandleRef(this, Hwnd)) && (!m_isPopupDialogShowing) && (e.Effects.HasFlag(DragDropEffects.Copy) || e.Effects.HasFlag(DragDropEffects.Move)))
234234
{
235235
string[] droppedFiles = e.Data.GetData(DataFormats.FileDrop) as string[];
236236
if (IsNotNull(droppedFiles))

src/Properties/Version.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace CertViewer.Properties
2020
internal class MyVersion
2121
{
2222
public const string VERSION_MAJOR = "1";
23-
public const string VERSION_MINOR = "3";
24-
public const string VERSION_PATCH = "1";
23+
public const string VERSION_MINOR = "4";
24+
public const string VERSION_PATCH = "0";
2525
}
2626
}

src/Utilities/Utilities.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,19 @@ public AtomicSwitchGuard(AtomicSwitch instance)
816816
m_instance = instance;
817817
}
818818

819-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
819+
~AtomicSwitchGuard()
820+
{
821+
Dispose(false);
822+
}
823+
820824
public void Dispose()
825+
{
826+
Dispose(true);
827+
GC.SuppressFinalize(this);
828+
}
829+
830+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
831+
private void Dispose(bool disposing)
821832
{
822833
if (Interlocked.CompareExchange(ref m_disposed, 1, 0) == 0)
823834
{

0 commit comments

Comments
 (0)