CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 09:17:36 +13:00
Code Issues Projects Releases Packages Wiki Activity

Added check contains image parameter

Browse source
This commit is contained in:
Jaex 2019-12-12 12:59:00 +03:00
parent 612ccc8ecc
commit 9aa35dbc6b
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ShareX.HelpersLib/Helpers/ClipboardHelpers.cs
View file

@ -196,24 +196,6 @@ public static bool CopyFile(string[] paths)
return false;
}
public static bool CopyTextFromFile(string path)
{
if (!string.IsNullOrEmpty(path) && File.Exists(path))
{
try
{
string text = File.ReadAllText(path, Encoding.UTF8);
return CopyText(text);
}
catch (Exception e)
{
DebugHelper.WriteException(e, "Clipboard copy text from file failed.");
}
}
return false;
}
public static bool CopyImageFromFile(string path)
{
if (!string.IsNullOrEmpty(path) && File.Exists(path))
@ -234,13 +216,34 @@ public static bool CopyImageFromFile(string path)
return false;
}
public static Image GetImage()
public static bool CopyTextFromFile(string path)
{
if (!string.IsNullOrEmpty(path) && File.Exists(path))
{
try
{
string text = File.ReadAllText(path, Encoding.UTF8);
return CopyText(text);
}
catch (Exception e)
{
DebugHelper.WriteException(e, "Clipboard copy text from file failed.");
}
}
return false;
}
public static Image GetImage(bool checkContainsImage = false)
{
try
{
lock (ClipboardLock)
{
return Clipboard.GetImage();
if (!checkContainsImage || Clipboard.ContainsImage())
{
return Clipboard.GetImage();
}
}
}
catch (Exception e)