GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/detect-rider-installed-from-toolbox-windows' of https://github.com/Walrusking16/FlaxEngine into Walrusking16-fix/detect-rider-installed-from-toolbox-windows

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-18 12:16:37 +02:00
parent f69b4ca410 425d625aa7
commit db790a13d4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
View File

@@ -44,6 +44,10 @@ namespace
if (document.HasParseError())
return;
// Check if this is actually rider and not another jetbrains product
if (document.FindMember("name")->value != "JetBrains Rider")
return;
// Find version
auto versionMember = document.FindMember("version");
if (versionMember == document.MemberEnd())
@@ -187,6 +191,7 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
SearchRegistry(&installations, HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\JetBrains Rider"));
// Versions installed via JetBrains Toolbox
FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("Programs"));
FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("JetBrains\\Toolbox\\apps\\Rider\\ch-0\\"));
FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("JetBrains\\Toolbox\\apps\\Rider\\ch-1\\")); // Beta versions
#endif