##// END OF EJS Templates
Merge pull request #7650 from minrk/initial-kernel...
Min RK -
r20291:9c72a135 merge
parent child Browse files
Show More
@@ -218,7 +218,8 b' define(['
218 return;
218 return;
219 }
219 }
220 }
220 }
221 if (this.notebook._session_starting) {
221 if (this.notebook._session_starting &&
222 this.notebook.session.kernel.name !== ks.name) {
222 console.error("Cannot change kernel while waiting for pending session start.");
223 console.error("Cannot change kernel while waiting for pending session start.");
223 return;
224 return;
224 }
225 }
@@ -232,7 +232,7 b' define(function (require) {'
232 language: data.spec.language,
232 language: data.spec.language,
233 };
233 };
234 // start session if the current session isn't already correct
234 // start session if the current session isn't already correct
235 if (!(this.session && this.session.kernel && this.session.kernel.name === data.name)) {
235 if (!(that.session && that.session.kernel && that.session.kernel.name === data.name)) {
236 that.start_session(data.name);
236 that.start_session(data.name);
237 }
237 }
238 });
238 });
General Comments 0
You need to be logged in to leave comments. Login now