From 0da404d4f8cc4b0323db74a725558dceb002e502 Mon Sep 17 00:00:00 2001
From: Henk <henk@henk.tech>
Date: Sun, 23 Oct 2022 14:10:44 +0200
Subject: [PATCH] Conda conflict fix

---
 commandline.bat          | 2 ++
 install_requirements.bat | 1 +
 play.bat                 | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/commandline.bat b/commandline.bat
index 001c0bae..d25da157 100644
--- a/commandline.bat
+++ b/commandline.bat
@@ -1,5 +1,7 @@
 @echo off
 cd /D %~dp0
+SET CONDA_SHLVL=
+
 TITLE CMD for KoboldAI Runtime
 SET /P M=<loader.settings
 IF %M%==1 GOTO drivemap
diff --git a/install_requirements.bat b/install_requirements.bat
index c82132ed..2a4534c1 100644
--- a/install_requirements.bat
+++ b/install_requirements.bat
@@ -8,6 +8,7 @@ echo.
 
 Reg add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v "LongPathsEnabled" /t REG_DWORD /d "1" /f 2>nul
 cd /D %~dp0
+SET CONDA_SHLVL=
 
 if exist miniconda3\ (
   echo Delete existing installation?
diff --git a/play.bat b/play.bat
index 4e54fbba..a44f0afa 100644
--- a/play.bat
+++ b/play.bat
@@ -1,5 +1,7 @@
 @echo off
 cd /D %~dp0
+SET CONDA_SHLVL=
+
 TITLE KoboldAI - Server
 SET /P M=<loader.settings
 IF %M%==1 GOTO drivemap