Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cloud instance ready indicator #138

Merged
merged 5 commits into from
Nov 9, 2014
Merged

Fix cloud instance ready indicator #138

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f3d831
Fixed bug when opening existing cloud projects
jseutter Nov 5, 2014
6b679fc
added a method to retrieve an instance by id
masci Nov 5, 2014
05a437e
fixed instance state handling
masci Nov 5, 2014
8a49d90
Merge pull request #37 from planctechnologies/gns-126
jseutter Nov 6, 2014
d866ced
Merge branch 'master' into dev
jseutter Nov 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixed bug when opening existing cloud projects
  • Loading branch information
@jseutter
jseutter committed Nov 5, 2014
commit 9f3d831d4c78e808fa7df8789ab688f2dc3b45b0
3 changes: 1 addition & 2 deletions gns3/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ def __init__(self, parent=None):
self._updateRecentFileActions()

self._cloud_provider = None
CloudInstances.instance().load()

# set the window icon
self.setWindowIcon(QtGui.QIcon(":/images/gns3.ico"))
Expand Down Expand Up @@ -385,7 +386,6 @@ def _newProjectActionSlot(self):
# let all modules know about the new project files directory
self.uiGraphicsView.updateProjectFilesDir(new_project_settings["project_files_dir"])

CloudInstances.instance().load()
topology = Topology.instance()
for instance in CloudInstances.instance().instances:
topology.addInstance2(instance)
Expand Down Expand Up @@ -1285,7 +1285,6 @@ def loadProject(self, path):
self._project_settings["project_type"] = "local"

topology.load(json_topology)
self._loadCloudInstances()

if need_to_save:
self.saveProject(path)
Expand Down