CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-07 15:35:47 +12:00
Code Issues Packages Projects Releases Wiki Activity

In debug don't check for extension id

Browse source
This commit is contained in:
Jaex 2015-08-29 04:24:21 +03:00
parent 82ac01f3fe
commit 4c4df2660c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ShareX/Forms/ChromeForm.cs
View file

@ -48,13 +48,19 @@ public ChromeForm()
private void CreateChromeHostManifest(string filepath)
{
string id = "";
#if !DEBUG
id = "chrome-extension://nlkoigbdolhchiicbonbihbphgamnaoc/";
#endif
var manifest = new
{
name = "com.getsharex.sharex",
description = "ShareX",
path = Program.ChromeHostPath,
type = "stdio",
allowed_origins = new string[] { "chrome-extension://nlkoigbdolhchiicbonbihbphgamnaoc/" }
allowed_origins = new string[] { id }
};
string json = JsonConvert.SerializeObject(manifest, Formatting.Indented);

4
ShareX/UploadTask.cs
View file

@ -1291,13 +1291,13 @@ private bool DownloadAndUpload()
if (!string.IsNullOrEmpty(Info.FilePath))
{
Helpers.CreateDirectoryIfNotExist(Info.FilePath);
Info.Status = Resources.UploadTask_DownloadAndUpload_Downloading;
OnStatusChanged();
try
{
Helpers.CreateDirectoryIfNotExist(Info.FilePath);
using (WebClient wc = new WebClient())
{
wc.Proxy = HelpersOptions.CurrentProxy.GetWebProxy();