bugfix: init after setting path, also make sure notebook get_view doesn't throw on invalid index

Author: zalox

src/notebook.cc

@@ -63,13 +63,19 @@ int Notebook::size() {
   return get_n_pages();
 }
 
-Source::View* Notebook::get_view(int page) {
-  return source_views.at(get_index(page));
+Source::View* Notebook::get_view(int page){
+  size_t index=get_index(page);
+  if(index!=static_cast<size_t>(-1))
+    return source_views[index];
+  else
+    return nullptr;
 }
 
-size_t Notebook::get_index(int page) {
-  for(size_t c=0;c<hboxes.size();c++) {
-    if(page_num(*hboxes.at(c))==page)
+size_t Notebook::get_index(int page){
+  if(page==-1)
+    return -1;
+  for(size_t c=0;c<hboxes.size();c++){
+    if(page_num(*hboxes[c])==page)
       return c;
   }
   return -1;

src/python_interpreter.cc

@@ -24,23 +24,18 @@ PythonInterpreter::PythonInterpreter(){
     return api.ptr();
   };
   PyImport_AppendInittab("jucipp", init_juci_api);
-  Py_Initialize();
   Config::get().load();
-
   auto plugin_path=Config::get().python.plugin_directory;
   add_path(Config::get().python.site_packages);
   add_path(plugin_path);
-
+  Py_Initialize();
   boost::filesystem::directory_iterator end_it;
   for(boost::filesystem::directory_iterator it(plugin_path);it!=end_it;it++){
     auto module_name=it->path().stem().string();
     if(module_name!="__pycache__"){
       auto module=import(module_name);
-      if(!module){
-        auto err=PythonError();
-        if(err)
-          std::cerr << std::string(err) << std::endl;
-      }
+      if(!module)
+        std::cerr << std::string(PythonError()) << std::endl;
     }
   }
 }