mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

🔪 Delete classes key if empty

Browse source
This commit is contained in:
Felix Rieseberg 2017-12-01 17:39:54 -08:00
parent 7c8acb5ea8
commit b4b729609a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/browser_win.cc
View file

@ -153,15 +153,16 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
// Main Registry Key // Main Registry Key
HKEY root = HKEY_CURRENT_USER; HKEY root = HKEY_CURRENT_USER;
base::string16 keyPath = base::UTF8ToUTF16("Software\\Classes\\" + protocol); base::string16 keyPath = L"Software\\Classes\\";
// Command Key // Command Key
base::string16 cmdPath = keyPath + L"\\shell\\open\\command"; base::string16 protocol16 = base::UTF8ToUTF16(protocol);
base::string16 cmdPath = keyPath + protocol16 + L"\\shell\\open\\command";
base::win::RegKey key; base::win::RegKey key;
base::win::RegKey commandKey; base::win::RegKey commandKey;
if (FAILED(key.Open(root, keyPath.c_str(), KEY_ALL_ACCESS))) if (FAILED(key.Open(root, keyPath.c_str(), KEY_ALL_ACCESS)))
// Key doesn't even exist, we can confirm that it is not set // Classes key doesn't exist, that's concerning, but I guess we're not the default handler
return true; return true;
if (FAILED(commandKey.Open(root, cmdPath.c_str(), KEY_ALL_ACCESS))) if (FAILED(commandKey.Open(root, cmdPath.c_str(), KEY_ALL_ACCESS)))
@ -179,9 +180,12 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
if (keyVal == exe) { if (keyVal == exe) {
// Let's kill the key // Let's kill the key
if (FAILED(key.DeleteKey(L"shell"))) if (FAILED(key.DeleteKey(protocol16 + L"shell")))
return false; return false;
// If empty, delete
key.DeleteEmptyKey(protocol16);
return true; return true;
} else { } else {
return true; return true;