Skip to content

Commit 0d36688

Browse files
Jack251970jjw24
authored andcommitted
Merge pull request #3816 from Flow-Launcher/clipboard_invalid
Use try-catch for query text box paste
1 parent 575236d commit 0d36688

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public partial class MainWindow : IDisposable
4343

4444
#region Private Fields
4545

46+
// Class Name
47+
private static readonly string ClassName = nameof(MainWindow);
48+
4649
// Dependency Injection
4750
private readonly Settings _settings;
4851
private readonly Theme _theme;
@@ -1229,14 +1232,21 @@ private void QueryTextBox_OnCopy(object sender, ExecutedRoutedEventArgs e)
12291232

12301233
private void QueryTextBox_OnPaste(object sender, DataObjectPastingEventArgs e)
12311234
{
1232-
var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
1233-
if (isText)
1235+
try
1236+
{
1237+
var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
1238+
if (isText)
1239+
{
1240+
var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
1241+
text = text.Replace(Environment.NewLine, " ");
1242+
DataObject data = new DataObject();
1243+
data.SetData(DataFormats.UnicodeText, text);
1244+
e.DataObject = data;
1245+
}
1246+
}
1247+
catch (Exception ex)
12341248
{
1235-
var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
1236-
text = text.Replace(Environment.NewLine, " ");
1237-
DataObject data = new DataObject();
1238-
data.SetData(DataFormats.UnicodeText, text);
1239-
e.DataObject = data;
1249+
App.API.LogException(ClassName, "Failed to paste text", ex);
12401250
}
12411251
}
12421252

0 commit comments

Comments
 (0)